diff options
| -rw-r--r-- | .travis.yml | 4 | ||||
| -rw-r--r-- | testsuite/Testsrc/test_code_checks.py | 5 | ||||
| -rw-r--r-- | testsuite/requirements-legacy.txt | 1 |
3 files changed, 6 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml index 6a061b233..33cd0f022 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,8 +2,8 @@ sudo: false language: python matrix: include: - - env: PYTHON=2.4 - - env: PYTHON=2.5 + - env: PYTHON=2.4 NOSE_EXCLUDE_DIRS=testsuite/Testsrc/Testlib/TestServer + - env: PYTHON=2.5 NOSE_EXCLUDE_DIRS=testsuite/Testsrc/Testlib/TestServer - python: "2.6" - python: "2.7" - python: "2.7_with_system_site_packages" diff --git a/testsuite/Testsrc/test_code_checks.py b/testsuite/Testsrc/test_code_checks.py index c26d8c139..44c4633a7 100644 --- a/testsuite/Testsrc/test_code_checks.py +++ b/testsuite/Testsrc/test_code_checks.py @@ -79,9 +79,10 @@ no_checks = { "lib/Bcfg2/Server/migrations": ["*.py"], "lib/Bcfg2/Server/south_migrations": ["*.py"], } + if sys.version_info < (2, 6): - # multiprocessing core requires py2.6 - no_checks['lib/Bcfg2/Server'] = ['MultiprocessingCore.py'] + # Server requires python 2.6 + no_checks['lib/Bcfg2'] = ['Server'] try: any diff --git a/testsuite/requirements-legacy.txt b/testsuite/requirements-legacy.txt index 87af9cfc6..7d918cb45 100644 --- a/testsuite/requirements-legacy.txt +++ b/testsuite/requirements-legacy.txt @@ -5,6 +5,7 @@ argparse ssl nose +nose-exclude<0.2 mock<1.1 unittest2<0.6 logilab-common==0.53.0 |