Scrapy, a fast high-level web crawling & scraping framework for Python.
Make mockserver runnable outside of tox
Paul Tremberthb1a0a6e25810
diff --git a/tests/mockserver.py b/tests/mockserver.pyindex 26ab51183..b95a6c3c4 100644--- a/tests/mockserver.py+++ b/tests/mockserver.py@@ -15,7 +15,6 @@ from twisted.internet.task import deferLaterfrom scrapy.utils.python import to_bytes, to_unicode-from tests import tests_datadirdef getarg(request, name, default=None, type=None):@@ -122,6 +121,7 @@ class Echo(LeafResource):'body': to_unicode(request.content.read()),}return to_bytes(json.dumps(output))+ render_POST = render_GETclass RedirectTo(LeafResource):@@ -174,7 +174,11 @@ class Root(Resource):self.putChild(b"echo", Echo())self.putChild(b"payload", PayloadResource())self.putChild(b"xpayload", EncodingResourceWrapper(PayloadResource(), [GzipEncoderFactory()]))- self.putChild(b"files", File(os.path.join(tests_datadir, 'test_site/files/')))+ try:+ from tests import tests_datadir+ self.putChild(b"files", File(os.path.join(tests_datadir, 'test_site/files/')))+ except:+ passself.putChild(b"redirect-to", RedirectTo())def getChild(self, name, request):