Skip to content

Scrapy, a fast high-level web crawling & scraping framework for Python.

Test cleanup.

Andrey Rakhmatullin79bf8b1f2e8e
diff --git a/tests/test_addons/__init__.py b/tests/test_addons/__init__.py
index d1c17a044..fa3f706e5 100644
--- a/tests/test_addons/__init__.py
+++ b/tests/test_addons/__init__.py
@@ -198,7 +198,7 @@ class AddonManagerTest(unittest.TestCase):
def test_load_settings_order(self):
# Get three addons named 0, 1, 2
addonlist = [addons.GoodAddon(str(x)) for x in range(3)]
- # Test both methods for every possible mutation
+ # Test for every possible ordering
for ordered_addons in itertools.permutations(addonlist):
expected_order = [a.name for a in ordered_addons]
settings = BaseSettings(
diff --git a/tests/test_crawl.py b/tests/test_crawl.py
index 1e97863b0..920e5f4ae 100644
--- a/tests/test_crawl.py
+++ b/tests/test_crawl.py
@@ -421,10 +421,8 @@ with multiples lines
addonmgr.add(FailedCheckAddon())
crawler = get_crawler(SimpleSpider)
crawler.addons = addonmgr
- # Doesn't work in 'precise' test environment:
- # with self.assertRaises(ValueError):
- # yield crawler.crawl()
- yield self.assertFailure(crawler.crawl(), ValueError)
+ with self.assertRaises(ValueError):
+ yield crawler.crawl()
class CrawlSpiderTestCase(TestCase):
diff --git a/tests/test_middleware.py b/tests/test_middleware.py
index fd57d846e..00ff746ee 100644
--- a/tests/test_middleware.py
+++ b/tests/test_middleware.py
@@ -87,15 +87,3 @@ class MiddlewareManagerTest(unittest.TestCase):
mwman = TestMiddlewareManager.from_settings(settings)
classes = [x.__class__ for x in mwman.middlewares]
self.assertEqual(classes, [M1, M3])
-
- def test_instances_from_settings(self):
- settings = Settings()
-
- class InstanceTestMiddlewareManager(MiddlewareManager):
- @classmethod
- def _get_mwlist_from_settings(cls, settings):
- return ["tests.test_middleware.M1", M2]
-
- mwman = InstanceTestMiddlewareManager.from_settings(settings)
- self.assertIsInstance(mwman.middlewares[0], M1)
- self.assertIsInstance(mwman.middlewares[1], M2)