diff --git a/integration/test_aaa_aardvark.py b/integration/test_aaa_aardvark.py index 4a2ef71a6..28ac4c412 100644 --- a/integration/test_aaa_aardvark.py +++ b/integration/test_aaa_aardvark.py @@ -5,6 +5,15 @@ # You can safely skip any of these tests, it'll just appear to "take # longer" to start the first test as the fixtures get built +from __future__ import unicode_literals +from __future__ import absolute_import +from __future__ import division +from __future__ import print_function + +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 + def test_create_flogger(flog_gatherer): print("Created flog_gatherer") diff --git a/src/allmydata/util/_python3.py b/src/allmydata/util/_python3.py index 17e74aa4f..9b166f5e0 100644 --- a/src/allmydata/util/_python3.py +++ b/src/allmydata/util/_python3.py @@ -21,6 +21,7 @@ if PY2: # integrations3. Bit of duplication, but it's only a handful of files so quite # temporary. PORTED_INTEGRATION_TESTS = [ + "integration.test_aaa_aardvark", "integration.test_servers_of_happiness", "integration.test_sftp", ] diff --git a/tox.ini b/tox.ini index 32252a346..fac52ad43 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' - py.test --timeout=1800 --coverage -v {posargs:integration/test_servers_of_happiness.py integration/test_sftp.py} + py.test --timeout=1800 --coverage -v {posargs:integration/test_aaa_aardvark.py integration/test_servers_of_happiness.py integration/test_sftp.py} coverage combine coverage report