diff --git a/integration/test_streaming_logs.py b/integration/test_streaming_logs.py index e5a3acedd..036d30715 100644 --- a/integration/test_streaming_logs.py +++ b/integration/test_streaming_logs.py @@ -1,3 +1,6 @@ +""" +Ported to Python 3. +""" from __future__ import ( print_function, unicode_literals, @@ -5,6 +8,10 @@ from __future__ import ( division, ) +from future.utils import PY2 +if PY2: + from future.builtins import filter, map, zip, ascii, chr, hex, input, next, oct, open, pow, round, super, bytes, dict, list, object, range, str, max, min # noqa: F401 + from six import ensure_text import json diff --git a/src/allmydata/util/_python3.py b/src/allmydata/util/_python3.py index 9b166f5e0..4bbfc0e68 100644 --- a/src/allmydata/util/_python3.py +++ b/src/allmydata/util/_python3.py @@ -18,12 +18,13 @@ if PY2: # Every time a module is added here, also add it to tox.ini environment -# integrations3. Bit of duplication, but it's only a handful of files so quite -# temporary. +# integrations3. Bit of duplication, but it's only a handful of files and quite +# temporary, just until we've ported them all. PORTED_INTEGRATION_TESTS = [ "integration.test_aaa_aardvark", "integration.test_servers_of_happiness", "integration.test_sftp", + "integration.test_streaming_logs", ] diff --git a/tox.ini b/tox.ini index 7f438ef2d..e6b745491 100644 --- a/tox.ini +++ b/tox.ini @@ -102,7 +102,7 @@ setenv = COVERAGE_PROCESS_START=.coveragerc commands = # NOTE: 'run with "py.test --keep-tempdir -s -v integration/" to debug failures' - python3 -b -m pytest --timeout=1800 --coverage -v {posargs:integration/test_aaa_aardvark.py integration/test_servers_of_happiness.py integration/test_sftp.py} + python3 -b -m pytest --timeout=1800 --coverage -v {posargs:integration/test_aaa_aardvark.py integration/test_servers_of_happiness.py integration/test_sftp.py integration/test_streaming_logs.py} coverage combine coverage report