Skip to content

Commit 628a8d8

Browse files
kmikekmike
committed
TST modernize some of the asserts
1 parent e2c1226 commit 628a8d8

File tree

6 files changed

+35
-34
lines changed

6 files changed

+35
-34
lines changed

‎tests/test_contrib_feedexport.py

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,9 @@ def _assert_stores(self, storage, path):
4343
file = storage.open(spider)
4444
file.write(b"content")
4545
yield storage.store(file)
46-
self.failUnless(os.path.exists(path))
46+
self.assertTrue(os.path.exists(path))
4747
with open(path, 'rb') as fp:
48-
self.failUnlessEqual(fp.read(), b"content")
48+
self.assertEqual(fp.read(), b"content")
4949

5050

5151
class FTPFeedStorageTest(unittest.TestCase):
@@ -65,13 +65,13 @@ def _assert_stores(self, storage, path):
6565
file = storage.open(spider)
6666
file.write(b"content")
6767
yield storage.store(file)
68-
self.failUnless(os.path.exists(path))
68+
self.assertTrue(os.path.exists(path))
6969
with open(path, 'rb') as fp:
70-
self.failUnlessEqual(fp.read(), b"content")
70+
self.assertEqual(fp.read(), b"content")
7171
# again, to check s3 objects are overwritten
7272
yield storage.store(BytesIO(b"new content"))
7373
with open(path, 'rb') as fp:
74-
self.failUnlessEqual(fp.read(), b"new content")
74+
self.assertEqual(fp.read(), b"new content")
7575

7676

7777
class S3FeedStorageTest(unittest.TestCase):
@@ -90,7 +90,8 @@ def test_store(self):
9090
yield storage.store(file)
9191
u = urlparse(uri)
9292
key = connect_s3().get_bucket(u.hostname, validate=False).get_key(u.path)
93-
self.failUnlessEqual(key.get_contents_as_string(), "content")
93+
self.assertEqual(key.get_contents_as_string(), "content")
94+
9495

9596
class StdoutFeedStorageTest(unittest.TestCase):
9697

‎tests/test_log.py

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -84,21 +84,21 @@ def test_err_noargs(self):
8484
a = 1/0
8585
except:
8686
log.err()
87-
self.failUnless('Traceback' in self.logged())
88-
self.failUnless('ZeroDivisionError' in self.logged())
87+
self.assertIn('Traceback', self.logged())
88+
self.assertIn('ZeroDivisionError', self.logged())
8989

9090
def test_err_why(self):
9191
log.err(TypeError("bad type"), "Wrong type")
9292
self.assertEqual(self.first_log_line(), "[scrapy] ERROR: Wrong type")
93-
self.failUnless('TypeError' in self.logged())
94-
self.failUnless('bad type' in self.logged())
93+
self.assertIn('TypeError', self.logged())
94+
self.assertIn('bad type', self.logged())
9595

9696
def test_error_outside_scrapy(self):
9797
"""Scrapy logger should still print outside errors"""
9898
txlog.err(TypeError("bad type"), "Wrong type")
9999
self.assertEqual(self.first_log_line(), "[-] ERROR: Wrong type")
100-
self.failUnless('TypeError' in self.logged())
101-
self.failUnless('bad type' in self.logged())
100+
self.assertIn('TypeError', self.logged())
101+
self.assertIn('bad type', self.logged())
102102

103103
# this test fails in twisted trial observer, not in scrapy observer
104104
# def test_err_why_encoding(self):
@@ -107,15 +107,15 @@ def test_error_outside_scrapy(self):
107107

108108
def test_err_exc(self):
109109
log.err(TypeError("bad type"))
110-
self.failUnless('Unhandled Error' in self.logged())
111-
self.failUnless('TypeError' in self.logged())
112-
self.failUnless('bad type' in self.logged())
110+
self.assertIn('Unhandled Error', self.logged())
111+
self.assertIn('TypeError', self.logged())
112+
self.assertIn('bad type', self.logged())
113113

114114
def test_err_failure(self):
115115
log.err(failure.Failure(TypeError("bad type")))
116-
self.failUnless('Unhandled Error' in self.logged())
117-
self.failUnless('TypeError' in self.logged())
118-
self.failUnless('bad type' in self.logged())
116+
self.assertIn('Unhandled Error', self.logged())
117+
self.assertIn('TypeError', self.logged())
118+
self.assertIn('bad type', self.logged())
119119

120120

121121
class Latin1ScrapyFileLogObserverTest(ScrapyFileLogObserverTest):

‎tests/test_middleware.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,10 +75,10 @@ def test_methods(self):
7575
def test_enabled(self):
7676
m1, m2, m3 = M1(), M2(), M3()
7777
mwman = MiddlewareManager(m1, m2, m3)
78-
self.failUnlessEqual(mwman.middlewares, (m1, m2, m3))
78+
self.assertEqual(mwman.middlewares, (m1, m2, m3))
7979

8080
def test_enabled_from_settings(self):
8181
settings = Settings()
8282
mwman = TestMiddlewareManager.from_settings(settings)
8383
classes = [x.__class__ for x in mwman.middlewares]
84-
self.failUnlessEqual(classes, [M1, M3])
84+
self.assertEqual(classes, [M1, M3])

‎tests/test_utils_defer.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ def test_process_chain(self):
5555
yield process_chain([cb1, cb_fail, cb3], 'res', 'v1', 'v2')
5656
except TypeError as e:
5757
gotexc = True
58-
self.failUnless(gotexc)
58+
self.assertTrue(gotexc)
5959

6060
@defer.inlineCallbacks
6161
def test_process_chain_both(self):
@@ -87,7 +87,7 @@ def itergood():
8787

8888
errors = []
8989
out = list(iter_errback(itergood(), errors.append))
90-
self.failUnlessEqual(out, range(10))
90+
self.assertEqual(out, range(10))
9191
self.failIf(errors)
9292

9393
def test_iter_errback_bad(self):
@@ -99,6 +99,6 @@ def iterbad():
9999

100100
errors = []
101101
out = list(iter_errback(iterbad(), errors.append))
102-
self.failUnlessEqual(out, [0, 1, 2, 3, 4])
103-
self.failUnlessEqual(len(errors), 1)
104-
self.failUnless(isinstance(errors[0].value, ZeroDivisionError))
102+
self.assertEqual(out, [0, 1, 2, 3, 4])
103+
self.assertEqual(len(errors), 1)
104+
self.assertIsInstance(errors[0].value, ZeroDivisionError)

‎tests/test_utils_python.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -87,15 +87,15 @@ class Obj:
8787
a.x = 1
8888
b.x = 1
8989
# equal attribute
90-
self.failUnless(equal_attributes(a, b, ['x']))
90+
self.assertTrue(equal_attributes(a, b, ['x']))
9191

9292
b.y = 2
9393
# obj1 has no attribute y
9494
self.failIf(equal_attributes(a, b, ['x', 'y']))
9595

9696
a.y = 2
9797
# equal attributes
98-
self.failUnless(equal_attributes(a, b, ['x', 'y']))
98+
self.assertTrue(equal_attributes(a, b, ['x', 'y']))
9999

100100
a.y = 1
101101
# differente attributes
@@ -104,7 +104,7 @@ class Obj:
104104
# test callable
105105
a.meta = {}
106106
b.meta = {}
107-
self.failUnless(equal_attributes(a, b, ['meta']))
107+
self.assertTrue(equal_attributes(a, b, ['meta']))
108108

109109
# compare ['meta']['a']
110110
a.meta['z'] = 1
@@ -114,7 +114,7 @@ class Obj:
114114
get_meta = operator.attrgetter('meta')
115115
compare_z = lambda obj: get_z(get_meta(obj))
116116

117-
self.failUnless(equal_attributes(a, b, [compare_z, 'x']))
117+
self.assertTrue(equal_attributes(a, b, [compare_z, 'x']))
118118
# fail z equality
119119
a.meta['z'] = 2
120120
self.failIf(equal_attributes(a, b, [compare_z, 'x']))
@@ -134,7 +134,7 @@ class _Weakme(object): pass
134134
def test_stringify_dict(self):
135135
d = {'a': 123, u'b': 'c', u'd': u'e', object(): u'e'}
136136
d2 = stringify_dict(d, keys_only=False)
137-
self.failUnlessEqual(d, d2)
137+
self.assertEqual(d, d2)
138138
self.failIf(d is d2) # shouldn't modify in place
139139
self.failIf(any(isinstance(x, unicode) for x in d2.keys()))
140140
self.failIf(any(isinstance(x, unicode) for x in d2.values()))
@@ -143,15 +143,15 @@ def test_stringify_dict_tuples(self):
143143
tuples = [('a', 123), (u'b', 'c'), (u'd', u'e'), (object(), u'e')]
144144
d = dict(tuples)
145145
d2 = stringify_dict(tuples, keys_only=False)
146-
self.failUnlessEqual(d, d2)
146+
self.assertEqual(d, d2)
147147
self.failIf(d is d2) # shouldn't modify in place
148148
self.failIf(any(isinstance(x, unicode) for x in d2.keys()), d2.keys())
149149
self.failIf(any(isinstance(x, unicode) for x in d2.values()))
150150

151151
def test_stringify_dict_keys_only(self):
152152
d = {'a': 123, u'b': 'c', u'd': u'e', object(): u'e'}
153153
d2 = stringify_dict(d)
154-
self.failUnlessEqual(d, d2)
154+
self.assertEqual(d, d2)
155155
self.failIf(d is d2) # shouldn't modify in place
156156
self.failIf(any(isinstance(x, unicode) for x in d2.keys()))
157157

‎tests/test_utils_signal.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,8 @@ def test_error_logged_if_deferred_not_supported(self):
7777
txlog.addObserver(log_events.append)
7878
dispatcher.connect(test_handler, test_signal)
7979
send_catch_log(test_signal)
80-
self.failUnless(log_events)
81-
self.failUnless("Cannot return deferreds from signal handler" in str(log_events))
80+
self.assertTrue(log_events)
81+
self.assertIn("Cannot return deferreds from signal handler", str(log_events))
8282
txlog.removeObserver(log_events.append)
8383
self.flushLoggedErrors()
8484
dispatcher.disconnect(test_handler, test_signal)

0 commit comments

Comments
 (0)