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

test_utils_iterators.py: support Windows the right way

This commit is contained in:
Adrián Chaves 2020-08-13 05:41:06 +02:00
parent 1c4b4cc6b0
commit 5f4df622a1
2 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/__init__.py
View File

@ -28,5 +28,5 @@ tests_datadir = os.path.join(os.path.abspath(os.path.dirname(__file__)),
def get_testdata(*paths): def get_testdata(*paths):
"""Return test data""" """Return test data"""
path = os.path.join(tests_datadir, *paths) path = os.path.join(tests_datadir, *paths)
with open(path, 'rb') as f: with open(path, 'rb', newline='') as f:
return f.read() return f.read()

15
tests/test_utils_iterators.py
View File

@ -7,9 +7,6 @@ from scrapy.http import XmlResponse, TextResponse, Response
from tests import get_testdata from tests import get_testdata
FOOBAR_NL = "foo{}bar".format(os.linesep)
class XmliterTestCase(unittest.TestCase): class XmliterTestCase(unittest.TestCase):
xmliter = staticmethod(xmliter) xmliter = staticmethod(xmliter)
@ -267,7 +264,7 @@ class UtilsCsvTestCase(unittest.TestCase):
self.assertEqual(result, self.assertEqual(result,
[{'id': '1', 'name': 'alpha', 'value': 'foobar'}, [{'id': '1', 'name': 'alpha', 'value': 'foobar'},
{'id': '2', 'name': 'unicode', 'value': '\xfan\xedc\xf3d\xe9\u203d'}, {'id': '2', 'name': 'unicode', 'value': '\xfan\xedc\xf3d\xe9\u203d'},
{'id': '3', 'name': 'multi', 'value': FOOBAR_NL}, {'id': '3', 'name': 'multi', 'value': "foo\nbar"},
{'id': '4', 'name': 'empty', 'value': ''}]) {'id': '4', 'name': 'empty', 'value': ''}])
# explicit type check cuz' we no like stinkin' autocasting! yarrr # explicit type check cuz' we no like stinkin' autocasting! yarrr
@ -283,7 +280,7 @@ class UtilsCsvTestCase(unittest.TestCase):
self.assertEqual([row for row in csv], self.assertEqual([row for row in csv],
[{'id': '1', 'name': 'alpha', 'value': 'foobar'}, [{'id': '1', 'name': 'alpha', 'value': 'foobar'},
{'id': '2', 'name': 'unicode', 'value': '\xfan\xedc\xf3d\xe9\u203d'}, {'id': '2', 'name': 'unicode', 'value': '\xfan\xedc\xf3d\xe9\u203d'},
{'id': '3', 'name': 'multi', 'value': FOOBAR_NL}, {'id': '3', 'name': 'multi', 'value': "foo\nbar"},
{'id': '4', 'name': 'empty', 'value': ''}]) {'id': '4', 'name': 'empty', 'value': ''}])
def test_csviter_quotechar(self): def test_csviter_quotechar(self):
@ -296,7 +293,7 @@ class UtilsCsvTestCase(unittest.TestCase):
self.assertEqual([row for row in csv1], self.assertEqual([row for row in csv1],
[{'id': '1', 'name': 'alpha', 'value': 'foobar'}, [{'id': '1', 'name': 'alpha', 'value': 'foobar'},
{'id': '2', 'name': 'unicode', 'value': '\xfan\xedc\xf3d\xe9\u203d'}, {'id': '2', 'name': 'unicode', 'value': '\xfan\xedc\xf3d\xe9\u203d'},
{'id': '3', 'name': 'multi', 'value': FOOBAR_NL}, {'id': '3', 'name': 'multi', 'value': "foo\nbar"},
{'id': '4', 'name': 'empty', 'value': ''}]) {'id': '4', 'name': 'empty', 'value': ''}])
response2 = TextResponse(url="http://example.com/", body=body2) response2 = TextResponse(url="http://example.com/", body=body2)
@ -305,7 +302,7 @@ class UtilsCsvTestCase(unittest.TestCase):
self.assertEqual([row for row in csv2], self.assertEqual([row for row in csv2],
[{'id': '1', 'name': 'alpha', 'value': 'foobar'}, [{'id': '1', 'name': 'alpha', 'value': 'foobar'},
{'id': '2', 'name': 'unicode', 'value': '\xfan\xedc\xf3d\xe9\u203d'}, {'id': '2', 'name': 'unicode', 'value': '\xfan\xedc\xf3d\xe9\u203d'},
{'id': '3', 'name': 'multi', 'value': FOOBAR_NL}, {'id': '3', 'name': 'multi', 'value': "foo\nbar"},
{'id': '4', 'name': 'empty', 'value': ''}]) {'id': '4', 'name': 'empty', 'value': ''}])
def test_csviter_wrong_quotechar(self): def test_csviter_wrong_quotechar(self):
@ -327,7 +324,7 @@ class UtilsCsvTestCase(unittest.TestCase):
self.assertEqual([row for row in csv], self.assertEqual([row for row in csv],
[{'id': '1', 'name': 'alpha', 'value': 'foobar'}, [{'id': '1', 'name': 'alpha', 'value': 'foobar'},
{'id': '2', 'name': 'unicode', 'value': '\xfan\xedc\xf3d\xe9\u203d'}, {'id': '2', 'name': 'unicode', 'value': '\xfan\xedc\xf3d\xe9\u203d'},
{'id': '3', 'name': 'multi', 'value': FOOBAR_NL}, {'id': '3', 'name': 'multi', 'value': "foo\nbar"},
{'id': '4', 'name': 'empty', 'value': ''}]) {'id': '4', 'name': 'empty', 'value': ''}])
def test_csviter_headers(self): def test_csviter_headers(self):
@ -353,7 +350,7 @@ class UtilsCsvTestCase(unittest.TestCase):
self.assertEqual([row for row in csv], self.assertEqual([row for row in csv],
[{'id': '1', 'name': 'alpha', 'value': 'foobar'}, [{'id': '1', 'name': 'alpha', 'value': 'foobar'},
{'id': '2', 'name': 'unicode', 'value': '\xfan\xedc\xf3d\xe9\u203d'}, {'id': '2', 'name': 'unicode', 'value': '\xfan\xedc\xf3d\xe9\u203d'},
{'id': '3', 'name': 'multi', 'value': FOOBAR_NL}, {'id': '3', 'name': 'multi', 'value': "foo\nbar"},
{'id': '4', 'name': 'empty', 'value': ''}]) {'id': '4', 'name': 'empty', 'value': ''}])
def test_csviter_exception(self): def test_csviter_exception(self):