From 05e358373e1b370a0d734f965a0f3ef8fb0487a5 Mon Sep 17 00:00:00 2001 From: axl89 Date: Tue, 19 Jul 2016 17:23:04 +0200 Subject: [PATCH] Fixed Enterprise tests --- .../console/{enterprise/PAN10.py => ENT_PAN10.py} | 0 tests/console/enterprise/__init__.py | 0 tests/run_console_tests.py | 15 ++++++++------- 3 files changed, 8 insertions(+), 7 deletions(-) rename tests/console/{enterprise/PAN10.py => ENT_PAN10.py} (100%) delete mode 100644 tests/console/enterprise/__init__.py diff --git a/tests/console/enterprise/PAN10.py b/tests/console/ENT_PAN10.py similarity index 100% rename from tests/console/enterprise/PAN10.py rename to tests/console/ENT_PAN10.py diff --git a/tests/console/enterprise/__init__.py b/tests/console/enterprise/__init__.py deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/tests/run_console_tests.py b/tests/run_console_tests.py index c4f5d27333..1571f0c97c 100755 --- a/tests/run_console_tests.py +++ b/tests/run_console_tests.py @@ -10,18 +10,19 @@ def get_test_file(test_list): #return [test[0].split(' ')[0].split('.')[0].split('<')[1] for test in test_list] return [test[0].test_name for test in test_list] +#Run Enterprise tests +is_enterprise = '1' == getenv('ENTERPRISE', False) + a = TestLoader() -tests = a.discover(start_dir='console',pattern='PAN*.py') + +if is_enterprise: + tests = a.discover(start_dir='console',pattern='*.py') +else: + tests = a.discover(start_dir='console',pattern='PAN*.py') c = ArticaTestResult() tests.run(c) -#Run Enterprise tests -is_enterprise = '1' == getenv('ENTERPRISE', False) -if is_enterprise: - enterprise_tests = a.discover(start_dir='console/enterprise',pattern='PAN*.py') - enterprise_tests.run(c) - #Update Saouce Labs jobs sauce_client = SauceClient(environ["SAUCE_USERNAME"], environ["SAUCE_ACCESS_KEY"]) for test,error_msg in c.failures+c.skipped+c.errors: