diff --git a/scrapy/tests/test_utils_url.py b/scrapy/tests/test_utils_url.py index deda64398..3bc56b5c3 100644 --- a/scrapy/tests/test_utils_url.py +++ b/scrapy/tests/test_utils_url.py @@ -54,15 +54,11 @@ class UrlUtilsTest(unittest.TestCase): spider = BaseSpider(name='example.com', allowed_domains=('example.com', 'example.net')) self.assertTrue(url_is_from_spider('http://www.example.com/some/page.html', spider)) - self.assertFalse(url_is_from_spider('http://www.example.org/some/page.html', spider)) - - spider = BaseSpider(name='example.com', allowed_domains={'example.org': None}) - self.assertTrue(url_is_from_spider('http://www.example.org/some/page.html', spider)) def test_url_is_from_spider_with_allowed_domains_class_attributes(self): class MySpider(BaseSpider): name = 'example.com' - allowed_domains = ['example.org', 'example.net'] + allowed_domains = ('example.org', 'example.net') self.assertTrue(url_is_from_spider('http://www.example.com/some/page.html', MySpider)) self.assertTrue(url_is_from_spider('http://sub.example.com/some/page.html', MySpider)) self.assertTrue(url_is_from_spider('http://example.com/some/page.html', MySpider)) @@ -70,16 +66,6 @@ class UrlUtilsTest(unittest.TestCase): self.assertTrue(url_is_from_spider('http://www.example.net/some/page.html', MySpider)) self.assertFalse(url_is_from_spider('http://www.example.us/some/page.html', MySpider)) - class MySetSpider(BaseSpider): - name = 'example.com' - allowed_domains = set(('example.org', 'example.net')) - self.assertTrue(url_is_from_spider('http://www.example.com/some/page.html', MySetSpider)) - self.assertTrue(url_is_from_spider('http://sub.example.com/some/page.html', MySetSpider)) - self.assertTrue(url_is_from_spider('http://example.com/some/page.html', MySetSpider)) - self.assertTrue(url_is_from_spider('http://www.example.org/some/page.html', MySetSpider)) - self.assertTrue(url_is_from_spider('http://www.example.net/some/page.html', MySetSpider)) - self.assertFalse(url_is_from_spider('http://www.example.us/some/page.html', MySetSpider)) - def test_canonicalize_url(self): # simplest case self.assertEqual(canonicalize_url("http://www.example.com/"),