Skip to content

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

Fix pickle test for pypy

Eugenio Lacuestad472402a0232
diff --git a/pytest.ini b/pytest.ini
index 4f3494e0e..d107c1fbe 100644
--- a/pytest.ini
+++ b/pytest.ini
@@ -166,6 +166,7 @@ flake8-ignore =
scrapy/signalmanager.py E501
scrapy/spiderloader.py F841 E501 E126
scrapy/squeues.py E128
+ scrapy/squeues.py E501
scrapy/statscollectors.py E501
# tests
tests/__init__.py E402 E501
diff --git a/tests/test_squeues.py b/tests/test_squeues.py
index 51c0c028a..d2cf9135f 100644
--- a/tests/test_squeues.py
+++ b/tests/test_squeues.py
@@ -1,3 +1,6 @@
+import pickle
+import sys
+
from queuelib.tests import test_queue as t
from scrapy.squeues import (
MarshalFifoDiskQueueNonRequest as MarshalFifoDiskQueue,
@@ -108,8 +111,10 @@ class PickleFifoDiskQueueTest(t.FifoDiskQueueTest, FifoDiskQueueTestMixin):
try:
q.push(lambda x: x)
except ValueError as exc:
- self.assertIsInstance(exc.__context__, AttributeError)
-
+ if hasattr(sys, "pypy_version_info"):
+ self.assertIsInstance(exc.__context__, pickle.PicklingError)
+ else:
+ self.assertIsInstance(exc.__context__, AttributeError)
sel = Selector(text='<html><body><p>some text</p></body></html>')
try:
q.push(sel)