RomanNum3ral
/
scrapy
mirror of https://github.com/scrapy/scrapy.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

TST modernize some of the asserts

This commit is contained in:
Mikhail Korobov 2014-08-01 23:44:23 +06:00
parent e2c1226838
commit 628a8d8a15
6 changed files with 35 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
tests/test_contrib_feedexport.py
View File

@ -43,9 +43,9 @@ class FileFeedStorageTest(unittest.TestCase):
file = storage.open(spider)
file.write(b"content")
yield storage.store(file)
self.failUnless(os.path.exists(path))
self.assertTrue(os.path.exists(path))
with open(path, 'rb') as fp:
self.failUnlessEqual(fp.read(), b"content")
self.assertEqual(fp.read(), b"content")
class FTPFeedStorageTest(unittest.TestCase):
@ -65,13 +65,13 @@ class FTPFeedStorageTest(unittest.TestCase):
file = storage.open(spider)
file.write(b"content")
yield storage.store(file)
self.failUnless(os.path.exists(path))
self.assertTrue(os.path.exists(path))
with open(path, 'rb') as fp:
self.failUnlessEqual(fp.read(), b"content")
self.assertEqual(fp.read(), b"content")
# again, to check s3 objects are overwritten
yield storage.store(BytesIO(b"new content"))
with open(path, 'rb') as fp:
self.failUnlessEqual(fp.read(), b"new content")
self.assertEqual(fp.read(), b"new content")
class S3FeedStorageTest(unittest.TestCase):
@ -90,7 +90,8 @@ class S3FeedStorageTest(unittest.TestCase):
yield storage.store(file)
u = urlparse(uri)
key = connect_s3().get_bucket(u.hostname, validate=False).get_key(u.path)
self.failUnlessEqual(key.get_contents_as_string(), "content")
self.assertEqual(key.get_contents_as_string(), "content")
class StdoutFeedStorageTest(unittest.TestCase):

24
tests/test_log.py
View File

@ -84,21 +84,21 @@ class ScrapyFileLogObserverTest(unittest.TestCase):
a = 1/0
except:
log.err()
self.failUnless('Traceback' in self.logged())
self.failUnless('ZeroDivisionError' in self.logged())
self.assertIn('Traceback', self.logged())
self.assertIn('ZeroDivisionError', self.logged())
def test_err_why(self):
log.err(TypeError("bad type"), "Wrong type")
self.assertEqual(self.first_log_line(), "[scrapy] ERROR: Wrong type")
self.failUnless('TypeError' in self.logged())
self.failUnless('bad type' in self.logged())
self.assertIn('TypeError', self.logged())
self.assertIn('bad type', self.logged())
def test_error_outside_scrapy(self):
"""Scrapy logger should still print outside errors"""
txlog.err(TypeError("bad type"), "Wrong type")
self.assertEqual(self.first_log_line(), "[-] ERROR: Wrong type")
self.failUnless('TypeError' in self.logged())
self.failUnless('bad type' in self.logged())
self.assertIn('TypeError', self.logged())
self.assertIn('bad type', self.logged())
# this test fails in twisted trial observer, not in scrapy observer
# def test_err_why_encoding(self):
@ -107,15 +107,15 @@ class ScrapyFileLogObserverTest(unittest.TestCase):
def test_err_exc(self):
log.err(TypeError("bad type"))
self.failUnless('Unhandled Error' in self.logged())
self.failUnless('TypeError' in self.logged())
self.failUnless('bad type' in self.logged())
self.assertIn('Unhandled Error', self.logged())
self.assertIn('TypeError', self.logged())
self.assertIn('bad type', self.logged())
def test_err_failure(self):
log.err(failure.Failure(TypeError("bad type")))
self.failUnless('Unhandled Error' in self.logged())
self.failUnless('TypeError' in self.logged())
self.failUnless('bad type' in self.logged())
self.assertIn('Unhandled Error', self.logged())
self.assertIn('TypeError', self.logged())
self.assertIn('bad type', self.logged())
class Latin1ScrapyFileLogObserverTest(ScrapyFileLogObserverTest):

4
tests/test_middleware.py
View File

@ -75,10 +75,10 @@ class MiddlewareManagerTest(unittest.TestCase):
def test_enabled(self):
m1, m2, m3 = M1(), M2(), M3()
mwman = MiddlewareManager(m1, m2, m3)
self.failUnlessEqual(mwman.middlewares, (m1, m2, m3))
self.assertEqual(mwman.middlewares, (m1, m2, m3))
def test_enabled_from_settings(self):
settings = Settings()
mwman = TestMiddlewareManager.from_settings(settings)
classes = [x.__class__ for x in mwman.middlewares]
self.failUnlessEqual(classes, [M1, M3])
self.assertEqual(classes, [M1, M3])

10
tests/test_utils_defer.py
View File

@ -55,7 +55,7 @@ class DeferUtilsTest(unittest.TestCase):
yield process_chain([cb1, cb_fail, cb3], 'res', 'v1', 'v2')
except TypeError as e:
gotexc = True
self.failUnless(gotexc)
self.assertTrue(gotexc)
@defer.inlineCallbacks
def test_process_chain_both(self):
@ -87,7 +87,7 @@ class IterErrbackTest(unittest.TestCase):
errors = []
out = list(iter_errback(itergood(), errors.append))
self.failUnlessEqual(out, range(10))
self.assertEqual(out, range(10))
self.failIf(errors)
def test_iter_errback_bad(self):
@ -99,6 +99,6 @@ class IterErrbackTest(unittest.TestCase):
errors = []
out = list(iter_errback(iterbad(), errors.append))
self.failUnlessEqual(out, [0, 1, 2, 3, 4])
self.failUnlessEqual(len(errors), 1)
self.failUnless(isinstance(errors[0].value, ZeroDivisionError))
self.assertEqual(out, [0, 1, 2, 3, 4])
self.assertEqual(len(errors), 1)
self.assertIsInstance(errors[0].value, ZeroDivisionError)

14
tests/test_utils_python.py
View File

@ -87,7 +87,7 @@ class UtilsPythonTestCase(unittest.TestCase):
a.x = 1
b.x = 1
# equal attribute
self.failUnless(equal_attributes(a, b, ['x']))
self.assertTrue(equal_attributes(a, b, ['x']))
b.y = 2
# obj1 has no attribute y
@ -95,7 +95,7 @@ class UtilsPythonTestCase(unittest.TestCase):
a.y = 2
# equal attributes
self.failUnless(equal_attributes(a, b, ['x', 'y']))
self.assertTrue(equal_attributes(a, b, ['x', 'y']))
a.y = 1
# differente attributes
@ -104,7 +104,7 @@ class UtilsPythonTestCase(unittest.TestCase):
# test callable
a.meta = {}
b.meta = {}
self.failUnless(equal_attributes(a, b, ['meta']))
self.assertTrue(equal_attributes(a, b, ['meta']))
# compare ['meta']['a']
a.meta['z'] = 1
@ -114,7 +114,7 @@ class UtilsPythonTestCase(unittest.TestCase):
get_meta = operator.attrgetter('meta')
compare_z = lambda obj: get_z(get_meta(obj))
self.failUnless(equal_attributes(a, b, [compare_z, 'x']))
self.assertTrue(equal_attributes(a, b, [compare_z, 'x']))
# fail z equality
a.meta['z'] = 2
self.failIf(equal_attributes(a, b, [compare_z, 'x']))
@ -134,7 +134,7 @@ class UtilsPythonTestCase(unittest.TestCase):
def test_stringify_dict(self):
d = {'a': 123, u'b': 'c', u'd': u'e', object(): u'e'}
d2 = stringify_dict(d, keys_only=False)
self.failUnlessEqual(d, d2)
self.assertEqual(d, d2)
self.failIf(d is d2) # shouldn't modify in place
self.failIf(any(isinstance(x, unicode) for x in d2.keys()))
self.failIf(any(isinstance(x, unicode) for x in d2.values()))
@ -143,7 +143,7 @@ class UtilsPythonTestCase(unittest.TestCase):
tuples = [('a', 123), (u'b', 'c'), (u'd', u'e'), (object(), u'e')]
d = dict(tuples)
d2 = stringify_dict(tuples, keys_only=False)
self.failUnlessEqual(d, d2)
self.assertEqual(d, d2)
self.failIf(d is d2) # shouldn't modify in place
self.failIf(any(isinstance(x, unicode) for x in d2.keys()), d2.keys())
self.failIf(any(isinstance(x, unicode) for x in d2.values()))
@ -151,7 +151,7 @@ class UtilsPythonTestCase(unittest.TestCase):
def test_stringify_dict_keys_only(self):
d = {'a': 123, u'b': 'c', u'd': u'e', object(): u'e'}
d2 = stringify_dict(d)
self.failUnlessEqual(d, d2)
self.assertEqual(d, d2)
self.failIf(d is d2) # shouldn't modify in place
self.failIf(any(isinstance(x, unicode) for x in d2.keys()))

4
tests/test_utils_signal.py
View File

@ -77,8 +77,8 @@ class SendCatchLogTest2(unittest.TestCase):
txlog.addObserver(log_events.append)
dispatcher.connect(test_handler, test_signal)
send_catch_log(test_signal)
self.failUnless(log_events)
self.failUnless("Cannot return deferreds from signal handler" in str(log_events))
self.assertTrue(log_events)
self.assertIn("Cannot return deferreds from signal handler", str(log_events))
txlog.removeObserver(log_events.append)
self.flushLoggedErrors()
dispatcher.disconnect(test_handler, test_signal)