Skip to content

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

test_feedexport: remove ordered=False

Adrián Chaves24f382fa4594
diff --git a/tests/test_feedexport.py b/tests/test_feedexport.py
index 946c94bd4..4006b5957 100644
--- a/tests/test_feedexport.py
+++ b/tests/test_feedexport.py
@@ -657,8 +657,8 @@ class FeedExportTestBase(ABC, unittest.TestCase):
return data
@defer.inlineCallbacks
- def assertExported(self, items, header, rows, settings=None, ordered=True):
- yield self.assertExportedCsv(items, header, rows, settings, ordered)
+ def assertExported(self, items, header, rows, settings=None):
+ yield self.assertExportedCsv(items, header, rows, settings)
yield self.assertExportedJsonLines(items, rows, settings)
yield self.assertExportedXml(items, rows, settings)
yield self.assertExportedPickle(items, rows, settings)
@@ -719,7 +719,7 @@ class FeedExportTest(FeedExportTestBase):
return content
@defer.inlineCallbacks
- def assertExportedCsv(self, items, header, rows, settings=None, ordered=True):
+ def assertExportedCsv(self, items, header, rows, settings=None):
settings = settings or {}
settings.update({
'FEEDS': {
@@ -730,10 +730,7 @@ class FeedExportTest(FeedExportTestBase):
reader = csv.DictReader(to_unicode(data['csv']).splitlines())
got_rows = list(reader)
- if ordered:
- self.assertEqual(reader.fieldnames, header)
- else:
- self.assertEqual(set(reader.fieldnames), set(header))
+ self.assertEqual(reader.fieldnames, header)
self.assertEqual(rows, got_rows)
@@ -886,7 +883,7 @@ class FeedExportTest(FeedExportTestBase):
{'egg': 'spam2', 'foo': 'bar2', 'baz': 'quux2'}
]
header = self.MyItem.fields.keys()
- yield self.assertExported(items, header, rows, ordered=False)
+ yield self.assertExported(items, header, rows)
@defer.inlineCallbacks
def test_export_no_items_not_store_empty(self):
@@ -958,7 +955,7 @@ class FeedExportTest(FeedExportTestBase):
{'egg': 'spam4', 'foo': '', 'baz': ''},
]
rows_jl = [dict(row) for row in items]
- yield self.assertExportedCsv(items, header, rows_csv, ordered=False)
+ yield self.assertExportedCsv(items, header, rows_csv)
yield self.assertExportedJsonLines(items, rows_jl)
@defer.inlineCallbacks
@@ -968,7 +965,7 @@ class FeedExportTest(FeedExportTestBase):
header = ["foo"]
rows = [{'foo': 'bar'}]
settings = {'FEED_EXPORT_FIELDS': []}
- yield self.assertExportedCsv(items, header, rows, ordered=False)
+ yield self.assertExportedCsv(items, header, rows)
yield self.assertExportedJsonLines(items, rows, settings)
@defer.inlineCallbacks
@@ -1146,7 +1143,7 @@ class FeedExportTest(FeedExportTestBase):
{'egg': 'spam', 'foo': 'bar'}
]
rows_jl = items
- yield self.assertExportedCsv(items, ['egg', 'foo'], rows_csv, ordered=False)
+ yield self.assertExportedCsv(items, ['egg', 'foo'], rows_csv)
yield self.assertExportedJsonLines(items, rows_jl)
@defer.inlineCallbacks
@@ -2065,7 +2062,7 @@ class BatchDeliveriesTest(FeedExportTestBase):
self.assertEqual(expected_batch, got_batch)
@defer.inlineCallbacks
- def assertExportedCsv(self, items, header, rows, settings=None, ordered=True):
+ def assertExportedCsv(self, items, header, rows, settings=None):
settings = settings or {}
settings.update({
'FEEDS': {