Skip to content

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

Refactor test_squeues.py

Eugenio Lacuestab1ddd7bd7b84
diff --git a/tests/test_squeues.py b/tests/test_squeues.py
index 5ad8035f7..7e997a25e 100644
--- a/tests/test_squeues.py
+++ b/tests/test_squeues.py
@@ -47,12 +47,7 @@ def nonserializable_object_test(self):
self.assertRaises(ValueError, q.push, sel)
-class MarshalFifoDiskQueueTest(t.FifoDiskQueueTest):
-
- chunksize = 100000
-
- def queue(self):
- return MarshalFifoDiskQueue(self.qpath, chunksize=self.chunksize)
+class FifoDiskQueueTestMixin:
def test_serialize(self):
q = self.queue()
@@ -66,6 +61,13 @@ class MarshalFifoDiskQueueTest(t.FifoDiskQueueTest):
test_nonserializable_object = nonserializable_object_test
+class MarshalFifoDiskQueueTest(t.FifoDiskQueueTest, FifoDiskQueueTestMixin):
+ chunksize = 100000
+
+ def queue(self):
+ return MarshalFifoDiskQueue(self.qpath, chunksize=self.chunksize)
+
+
class ChunkSize1MarshalFifoDiskQueueTest(MarshalFifoDiskQueueTest):
chunksize = 1
@@ -82,7 +84,7 @@ class ChunkSize4MarshalFifoDiskQueueTest(MarshalFifoDiskQueueTest):
chunksize = 4
-class PickleFifoDiskQueueTest(MarshalFifoDiskQueueTest):
+class PickleFifoDiskQueueTest(t.FifoDiskQueueTest, FifoDiskQueueTestMixin):
chunksize = 100000
@@ -133,10 +135,7 @@ class ChunkSize4PickleFifoDiskQueueTest(PickleFifoDiskQueueTest):
chunksize = 4
-class MarshalLifoDiskQueueTest(t.LifoDiskQueueTest):
-
- def queue(self):
- return MarshalLifoDiskQueue(self.qpath)
+class LifoDiskQueueTestMixin:
def test_serialize(self):
q = self.queue()
@@ -150,7 +149,13 @@ class MarshalLifoDiskQueueTest(t.LifoDiskQueueTest):
test_nonserializable_object = nonserializable_object_test
-class PickleLifoDiskQueueTest(MarshalLifoDiskQueueTest):
+class MarshalLifoDiskQueueTest(t.LifoDiskQueueTest, LifoDiskQueueTestMixin):
+
+ def queue(self):
+ return MarshalLifoDiskQueue(self.qpath)
+
+
+class PickleLifoDiskQueueTest(t.LifoDiskQueueTest, LifoDiskQueueTestMixin):
def queue(self):
return PickleLifoDiskQueue(self.qpath)