Skip to content

Commit 70ecf5e

Browse files
committed
cange type or arg to assertIn from string to byte.
1 parent ee57350 commit 70ecf5e

File tree

1 file changed

+10
-11
lines changed

1 file changed

+10
-11
lines changed

test/test_liveserver.py

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,7 @@ def test_byte_Ranges(self):
245245
self.assertEqual(f.headers['content-range'],
246246
"bytes 11-%s/%s"%(int(expected_length) - 1,
247247
expected_length))
248-
self.assertIn("SHA:", f.content) # detect sha sum at end of file
248+
self.assertIn(b"SHA:", f.content) # detect sha sum at end of file
249249

250250
# conditional request 11 bytes since etag matches 206 code
251251
hdrs = {"Range": "bytes=0-10"}
@@ -298,7 +298,7 @@ def test_byte_Ranges(self):
298298
self.assertEqual(f.status_code, 200)
299299
self.assertNotIn('content-range', f.headers,
300300
'content-range should not be present')
301-
self.assertIn("SHA:", f.content) # detect sha sum at end of file
301+
self.assertIn(b"SHA:", f.content) # detect sha sum at end of file
302302

303303
# invalid range is single number not number followed by -
304304
hdrs['Range'] = "bytes=1"
@@ -307,7 +307,7 @@ def test_byte_Ranges(self):
307307
self.assertEqual(f.status_code, 200)
308308
self.assertNotIn('content-range', f.headers,
309309
'content-range should not be present')
310-
self.assertIn("SHA:", f.content) # detect sha sum at end of file
310+
self.assertIn(b"SHA:", f.content) # detect sha sum at end of file
311311

312312
# range is invalid first number not a number
313313
hdrs['Range'] = "bytes=boom-99" # bad first value
@@ -316,7 +316,7 @@ def test_byte_Ranges(self):
316316
self.assertEqual(f.status_code, 200)
317317
self.assertNotIn('content-range', f.headers,
318318
'content-range should not be present')
319-
self.assertIn("SHA:", f.content) # detect sha sum at end of file
319+
self.assertIn(b"SHA:", f.content) # detect sha sum at end of file
320320

321321
# range is invalid last number not a number
322322
hdrs['Range'] = "bytes=1-boom" # bad last value
@@ -325,7 +325,7 @@ def test_byte_Ranges(self):
325325
self.assertEqual(f.status_code, 200)
326326
self.assertNotIn('content-range', f.headers,
327327
'content-range should not be present')
328-
self.assertIn("SHA:", f.content) # detect sha sum at end of file
328+
self.assertIn(b"SHA:", f.content) # detect sha sum at end of file
329329

330330
# range is invalid first position empty
331331
hdrs['Range'] = "bytes=-11" # missing first value
@@ -334,7 +334,7 @@ def test_byte_Ranges(self):
334334
self.assertEqual(f.status_code, 200)
335335
self.assertNotIn('content-range', f.headers,
336336
'content-range should not be present')
337-
self.assertIn("SHA:", f.content) # detect sha sum at end of file
337+
self.assertIn(b"SHA:", f.content) # detect sha sum at end of file
338338

339339
# range is invalid #2 < #1
340340
hdrs['Range'] = "bytes=11-1" # inverted range
@@ -343,7 +343,7 @@ def test_byte_Ranges(self):
343343
self.assertEqual(f.status_code, 200)
344344
self.assertNotIn('content-range', f.headers,
345345
'content-range should not be present')
346-
self.assertIn("SHA:", f.content) # detect sha sum at end of file
346+
self.assertIn(b"SHA:", f.content) # detect sha sum at end of file
347347

348348
# range is invalid negative first number
349349
hdrs['Range'] = "bytes=-1-11" # negative first number
@@ -352,7 +352,7 @@ def test_byte_Ranges(self):
352352
self.assertEqual(f.status_code, 200)
353353
self.assertNotIn('content-range', f.headers,
354354
'content-range should not be present')
355-
self.assertIn("SHA:", f.content) # detect sha sum at end of file
355+
self.assertIn(b"SHA:", f.content) # detect sha sum at end of file
356356

357357
# range is invalid negative second number
358358
hdrs['Range'] = "bytes=1--11" # negative second number
@@ -361,7 +361,7 @@ def test_byte_Ranges(self):
361361
self.assertEqual(f.status_code, 200)
362362
self.assertNotIn('content-range', f.headers,
363363
'content-range should not be present')
364-
self.assertIn("SHA:", f.content) # detect sha sum at end of file
364+
self.assertIn(b"SHA:", f.content) # detect sha sum at end of file
365365

366366
# range is unsupported units
367367
hdrs['Range'] = "badunits=1-11"
@@ -370,7 +370,7 @@ def test_byte_Ranges(self):
370370
self.assertEqual(f.status_code, 200)
371371
self.assertNotIn('content-range', f.headers,
372372
'content-range should not be present')
373-
self.assertIn("SHA:", f.content) # detect sha sum at end of file
373+
self.assertIn(b"SHA:", f.content) # detect sha sum at end of file
374374

375375

376376
# valid range, invalid file
@@ -681,7 +681,6 @@ def test_ims(self):
681681

682682

683683
def test_load_issue1(self):
684-
import pdb; pdb.set_trace()
685684
for tail in [
686685
'/issue1', # normal url
687686
'/issue00001', # leading 0's should be stripped from id

0 commit comments

Comments
 (0)