diff --git a/tests/console/ACL.py b/tests/console/ACL.py index c2d14944f3..e2cf784578 100644 --- a/tests/console/ACL.py +++ b/tests/console/ACL.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- from include.common_classes_60 import PandoraWebDriverTestCase -from include.common_functions_60 import login, is_element_present, click_menu_element, detect_and_pass_all_wizards, logout, gen_random_string, is_enterprise +from include.common_functions_60 import is_element_present, click_menu_element, detect_and_pass_all_wizards, gen_random_string, is_enterprise from include.agent_functions import create_agent, search_agent, create_agent_group from include.user_functions import create_user, create_user_profile from include.module_functions import create_module diff --git a/tests/console/Bulk_operations.py b/tests/console/Bulk_operations.py index 3c4a3f52bd..639df441c1 100644 --- a/tests/console/Bulk_operations.py +++ b/tests/console/Bulk_operations.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- from include.common_classes_60 import PandoraWebDriverTestCase -from include.common_functions_60 import login, click_menu_element, detect_and_pass_all_wizards +from include.common_functions_60 import click_menu_element, detect_and_pass_all_wizards from include.agent_functions import create_agent from selenium import webdriver from selenium.webdriver.common.by import By diff --git a/tests/console/Misc.py b/tests/console/Misc.py index 5ec6c30914..7e1c96e21a 100644 --- a/tests/console/Misc.py +++ b/tests/console/Misc.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- from include.common_classes_60 import PandoraWebDriverTestCase -from include.common_functions_60 import login, click_menu_element, refresh_N_times_until_find_element, detect_and_pass_all_wizards, is_element_present, logout +from include.common_functions_60 import click_menu_element, refresh_N_times_until_find_element, detect_and_pass_all_wizards, is_element_present from include.reports_functions import create_report, delete_report from include.user_functions import create_user from include.agent_functions import create_agent diff --git a/tests/console/Planned_downtime.py b/tests/console/Planned_downtime.py index 07f063b503..df2b47be88 100644 --- a/tests/console/Planned_downtime.py +++ b/tests/console/Planned_downtime.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- from include.common_classes_60 import PandoraWebDriverTestCase -from include.common_functions_60 import login, click_menu_element, detect_and_pass_all_wizards, logout, gen_random_string, refresh_N_times_until_find_element +from include.common_functions_60 import click_menu_element, detect_and_pass_all_wizards, gen_random_string, refresh_N_times_until_find_element from include.planned_downtime_functions import * from include.alert_functions import * from include.module_functions import * diff --git a/tests/console/Policies.py b/tests/console/Policies.py index 3fa32da873..40d0f327ee 100644 --- a/tests/console/Policies.py +++ b/tests/console/Policies.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- from include.common_classes_60 import PandoraWebDriverTestCase -from include.common_functions_60 import login, detect_and_pass_all_wizards, gen_random_string, is_enterprise +from include.common_functions_60 import detect_and_pass_all_wizards, gen_random_string, is_enterprise from include.policy_functions import * from include.agent_functions import * from include.collection_functions import * diff --git a/tests/console/Quiet_functionality.py b/tests/console/Quiet_functionality.py index aaf4b18b20..5b58421c4c 100644 --- a/tests/console/Quiet_functionality.py +++ b/tests/console/Quiet_functionality.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- from include.common_classes_60 import PandoraWebDriverTestCase -from include.common_functions_60 import login, click_menu_element, detect_and_pass_all_wizards, logout, gen_random_string +from include.common_functions_60 import click_menu_element, detect_and_pass_all_wizards, gen_random_string from include.planned_downtime_functions import * from include.alert_functions import * from include.module_functions import * diff --git a/tests/console/Users.py b/tests/console/Users.py index 067da3bfdf..61589b13c1 100644 --- a/tests/console/Users.py +++ b/tests/console/Users.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- from include.common_classes_60 import PandoraWebDriverTestCase -from include.common_functions_60 import login, logout, click_menu_element, detect_and_pass_all_wizards, activate_home_screen +from include.common_functions_60 import click_menu_element, detect_and_pass_all_wizards, activate_home_screen from selenium import webdriver from selenium.webdriver.common.by import By from selenium.webdriver.common.keys import Keys diff --git a/tests/console/icmp_test.py b/tests/console/icmp_test.py index a9c519277f..d19d064691 100644 --- a/tests/console/icmp_test.py +++ b/tests/console/icmp_test.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- from include.common_classes_60 import PandoraWebDriverTestCase -from include.common_functions_60 import login, click_menu_element, refresh_N_times_until_find_element, detect_and_pass_all_wizards, gen_random_string +from include.common_functions_60 import click_menu_element, refresh_N_times_until_find_element, detect_and_pass_all_wizards, gen_random_string from include.agent_functions import create_agent from selenium import webdriver from selenium.webdriver.common.by import By diff --git a/tests/console/include/policy_functions.py b/tests/console/include/policy_functions.py index 7ec9a34280..8f244ee29d 100644 --- a/tests/console/include/policy_functions.py +++ b/tests/console/include/policy_functions.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- from common_classes_60 import PandoraWebDriverTestCase -from common_functions_60 import login, click_menu_element, detect_and_pass_all_wizards, logout +from common_functions_60 import click_menu_element, detect_and_pass_all_wizards from selenium import webdriver from selenium.webdriver.common.by import By from selenium.webdriver.common.keys import Keys diff --git a/tests/run_console_tests.py b/tests/run_console_tests.py index 0ffd1718e7..f97da53725 100755 --- a/tests/run_console_tests.py +++ b/tests/run_console_tests.py @@ -75,6 +75,8 @@ class TracingStreamResult(testtools.StreamResult): self.skipped.append('test_id') is_enterprise = '1' == getenv('ENTERPRISE', False) +num_threads = 0 + if is_enterprise: num_threads = 2 else: @@ -85,6 +87,7 @@ a = ArticaTestLoader() tests = a.discover(start_dir='console',pattern='*.py') print str(tests.countTestCases())+" tests found" +print "Using "+str(num_threads)+" threads" concurrent_suite = testtools.ConcurrentStreamTestSuite(lambda: (split_suite_into_chunks(num_threads, tests))) result = TracingStreamResult()