From a01946d28575bd58da2888d851f09c03d6abe022 Mon Sep 17 00:00:00 2001 From: axl89 Date: Tue, 12 Jul 2016 09:35:02 +0200 Subject: [PATCH] Added capabilities to run Enterprise tests under the tests/console/enterprise directory --- tests/console/enterprise/__init__.py | 0 tests/run_console_tests.py | 8 +++++++- 2 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 tests/console/enterprise/__init__.py diff --git a/tests/console/enterprise/__init__.py b/tests/console/enterprise/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tests/run_console_tests.py b/tests/run_console_tests.py index c14f55b7f6..60f8b91e82 100755 --- a/tests/run_console_tests.py +++ b/tests/run_console_tests.py @@ -3,7 +3,7 @@ from unittest import * from console.include.common_functions_60 import * from console.include.common_classes_60 import * from sauceclient import SauceClient -from os import environ +from os import environ, getenv import subprocess, time, sys def get_test_file(test_list): @@ -12,6 +12,12 @@ def get_test_file(test_list): a = TestLoader() tests = a.discover(start_dir='console',pattern='PAN*.py') + +#Run Enterprise tests +is_enterprise = '1' == getenv('ENTERPRISE', False) +if is_enterprise: + tests = tests.addTests(a.discover(start_dir='console/enterprise',pattern='PAN*.py')) + c = ArticaTestResult() tests.run(c)