Revert "Fixing test framework"

This reverts commit c97c8d0868.

tests/console/ACL.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 from include.common_classes_60 import PandoraWebDriverTestCase
-from include.common_functions_60 import  is_element_present, click_menu_element, detect_and_pass_all_wizards, gen_random_string, is_enterprise
+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.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

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  click_menu_element, detect_and_pass_all_wizards
+from include.common_functions_60 import login, 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

tests/console/Misc.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 from include.common_classes_60 import PandoraWebDriverTestCase
-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.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.reports_functions import create_report, delete_report
 from include.user_functions import create_user
 from include.agent_functions import create_agent

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  click_menu_element, detect_and_pass_all_wizards, gen_random_string, refresh_N_times_until_find_element
+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.planned_downtime_functions import *
 from include.alert_functions import *
 from include.module_functions import *

tests/console/Policies.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 from include.common_classes_60 import PandoraWebDriverTestCase
-from include.common_functions_60 import  detect_and_pass_all_wizards, gen_random_string, is_enterprise
+from include.common_functions_60 import login, 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 *

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  click_menu_element, detect_and_pass_all_wizards, gen_random_string
+from include.common_functions_60 import login, click_menu_element, detect_and_pass_all_wizards, logout, gen_random_string
 from include.planned_downtime_functions import *
 from include.alert_functions import *
 from include.module_functions import *

tests/console/Users.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 from include.common_classes_60 import PandoraWebDriverTestCase
-from include.common_functions_60 import  click_menu_element, detect_and_pass_all_wizards, activate_home_screen
+from include.common_functions_60 import login, logout, 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

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  click_menu_element, refresh_N_times_until_find_element, detect_and_pass_all_wizards, gen_random_string
+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.agent_functions import create_agent
 from selenium import webdriver
 from selenium.webdriver.common.by import By

tests/console/include/policy_functions.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 from common_classes_60 import PandoraWebDriverTestCase
-from common_functions_60 import click_menu_element, detect_and_pass_all_wizards
+from common_functions_60 import login, click_menu_element, detect_and_pass_all_wizards, logout
 from selenium import webdriver
 from selenium.webdriver.common.by import By
 from selenium.webdriver.common.keys import Keys

tests/run_console_tests.py

@@ -75,8 +75,6 @@ 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:
@@ -87,7 +85,6 @@ 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()