Merge pull request #1716 from lopuhin/py3-test-pipeline-files-images

[MRG+1] py3: test_pipeline_files and test_pipeline_images
This commit is contained in:
Daniel Graña 2016-01-25 18:24:12 -03:00
commit b20463183c
3 changed files with 5 additions and 4 deletions

View File

@ -1,7 +1,5 @@
tests/test_exporters.py
tests/test_linkextractors_deprecated.py
tests/test_pipeline_files.py
tests/test_pipeline_images.py
tests/test_proxy_connect.py
scrapy/xlib/tx/iweb.py
@ -12,8 +10,6 @@ scrapy/xlib/tx/_newclient.py
scrapy/xlib/tx/__init__.py
scrapy/core/downloader/handlers/s3.py
scrapy/core/downloader/handlers/ftp.py
scrapy/pipelines/images.py
scrapy/pipelines/files.py
scrapy/linkextractors/sgml.py
scrapy/linkextractors/regex.py
scrapy/linkextractors/htmlparser.py

View File

@ -4,6 +4,7 @@ pytest-cov
testfixtures
jmespath
leveldb
boto
# optional for shell wrapper tests
bpython
ipython

View File

@ -437,6 +437,8 @@ class S3AnonTestCase(unittest.TestCase):
import boto
except ImportError:
skip = 'missing boto library'
if six.PY3:
skip = 'S3 not supported on Py3'
def setUp(self):
self.s3reqh = S3DownloadHandler(Settings(),
@ -459,6 +461,8 @@ class S3TestCase(unittest.TestCase):
import boto
except ImportError:
skip = 'missing boto library'
if six.PY3:
skip = 'S3 not supported on Py3'
# test use same example keys than amazon developer guide
# http://s3.amazonaws.com/awsdocs/S3/20060301/s3-dg-20060301.pdf