diff options
| author | Sol Jerome <sol.jerome@gmail.com> | 2017-08-18 15:01:32 -0500 |
|---|---|---|
| committer | Sol Jerome <sol.jerome@gmail.com> | 2017-08-18 15:01:32 -0500 |
| commit | e193079d1779e4d66d80882e6f1c3ff9ba05619b (patch) | |
| tree | b47f262f3b7d57a1ddeefd0f2aeba3bb35539d18 /testsuite/Testsrc | |
| parent | cd0f5f5f62376f7dc64e5c5c7d59a7c6bfcb918f (diff) | |
| parent | 0fdabbcb4668d5f70f76c08a6e3216c5542e7457 (diff) | |
| download | bcfg2-e193079d1779e4d66d80882e6f1c3ff9ba05619b.tar.gz bcfg2-e193079d1779e4d66d80882e6f1c3ff9ba05619b.tar.bz2 bcfg2-e193079d1779e4d66d80882e6f1c3ff9ba05619b.zip | |
Merge branch 'feature/travis-container' of https://github.com/AlexanderS/bcfg2
Diffstat (limited to 'testsuite/Testsrc')
| -rw-r--r-- | testsuite/Testsrc/test_code_checks.py | 5 | ||||
| -rw-r--r-- | testsuite/Testsrc/test_doc.py | 2 |
2 files changed, 4 insertions, 3 deletions
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/Testsrc/test_doc.py b/testsuite/Testsrc/test_doc.py index 93c8d1bb4..d105254c5 100644 --- a/testsuite/Testsrc/test_doc.py +++ b/testsuite/Testsrc/test_doc.py @@ -20,7 +20,7 @@ except ImportError: HAS_SPHINX = False -TEST_SPHINX = bool(os.environ.get('TEST_SPHINX', 'yes') != 'no') +TEST_SPHINX = bool(os.environ.get('TEST_SPHINX', 'no') != 'no') class DocTest(Bcfg2TestCase): |