diff --git a/ui_tests/conftest.py b/ui_tests/conftest.py index 9cce9fef4..22e5995a9 100644 --- a/ui_tests/conftest.py +++ b/ui_tests/conftest.py @@ -1,7 +1,7 @@ import pytest -from webdriver.webriver_factory import WebDriverFactory from logger.logger import Logger +from webdriver.webriver_factory import WebDriverFactory logger = Logger().get_logger() diff --git a/ui_tests/pages/groups_page.py b/ui_tests/pages/groups_page.py index 2b19ec884..2818699a2 100644 --- a/ui_tests/pages/groups_page.py +++ b/ui_tests/pages/groups_page.py @@ -1,9 +1,10 @@ import time -from webdriver.webriver_factory import WebDriverFactory -from logger.logger import Logger from selenium.webdriver.common.by import By + import pages.helper as helper +from logger.logger import Logger +from webdriver.webriver_factory import WebDriverFactory logger = Logger().get_logger() driver = WebDriverFactory.get_driver() diff --git a/ui_tests/pages/header_page.py b/ui_tests/pages/header_page.py index 159e375d4..868fc268c 100644 --- a/ui_tests/pages/header_page.py +++ b/ui_tests/pages/header_page.py @@ -1,10 +1,11 @@ import re import time -from webdriver.webriver_factory import WebDriverFactory -from logger.logger import Logger from selenium.webdriver.common.by import By +from logger.logger import Logger +from webdriver.webriver_factory import WebDriverFactory + logger = Logger().get_logger() driver = WebDriverFactory.get_driver() diff --git a/ui_tests/pages/helper.py b/ui_tests/pages/helper.py index 560e5af05..77a34e2e5 100644 --- a/ui_tests/pages/helper.py +++ b/ui_tests/pages/helper.py @@ -1,6 +1,6 @@ -from logger.logger import Logger from selenium.webdriver.common.keys import Keys +from logger.logger import Logger logger = Logger().get_logger() diff --git a/ui_tests/pages/inventory_page.py b/ui_tests/pages/inventory_page.py index 70b0116c9..f7b3bf97d 100644 --- a/ui_tests/pages/inventory_page.py +++ b/ui_tests/pages/inventory_page.py @@ -1,12 +1,12 @@ import time import selenium.common.exceptions - -from webdriver.webriver_factory import WebDriverFactory -from logger.logger import Logger from selenium.webdriver.common.by import By from selenium.webdriver.common.keys import Keys + import pages.helper as helper +from logger.logger import Logger +from webdriver.webriver_factory import WebDriverFactory logger = Logger().get_logger() driver = WebDriverFactory.get_driver() diff --git a/ui_tests/pages/profiles_page.py b/ui_tests/pages/profiles_page.py index 88150b6ca..fc5bdccaf 100644 --- a/ui_tests/pages/profiles_page.py +++ b/ui_tests/pages/profiles_page.py @@ -1,10 +1,11 @@ import time -from webdriver.webriver_factory import WebDriverFactory -from logger.logger import Logger from selenium.webdriver.common.by import By from selenium.webdriver.common.keys import Keys + import pages.helper as helper +from logger.logger import Logger +from webdriver.webriver_factory import WebDriverFactory logger = Logger().get_logger() driver = WebDriverFactory.get_driver() diff --git a/ui_tests/pages/yaml_values_reader.py b/ui_tests/pages/yaml_values_reader.py index aab5a0d88..6a35cdce9 100644 --- a/ui_tests/pages/yaml_values_reader.py +++ b/ui_tests/pages/yaml_values_reader.py @@ -1,4 +1,5 @@ import yaml + from config import config diff --git a/ui_tests/splunk_search.py b/ui_tests/splunk_search.py index f532e4cf3..3068ec268 100644 --- a/ui_tests/splunk_search.py +++ b/ui_tests/splunk_search.py @@ -16,12 +16,13 @@ import json import logging -import time -import requests import os import sys -from requests.packages.urllib3.util.retry import Retry +import time + +import requests from requests.adapters import HTTPAdapter +from requests.packages.urllib3.util.retry import Retry TIMEROUT = 500 diff --git a/ui_tests/tests/test_save_update_configuration.py b/ui_tests/tests/test_save_update_configuration.py index 819177cd8..01b656599 100644 --- a/ui_tests/tests/test_save_update_configuration.py +++ b/ui_tests/tests/test_save_update_configuration.py @@ -9,7 +9,6 @@ from pages.profiles_page import ProfilesPage from pages.yaml_values_reader import YamlValuesReader from webdriver.webriver_factory import WebDriverFactory -from webdriver.webriver_factory import WebDriverFactory logger = Logger().get_logger() driver = WebDriverFactory().get_driver() diff --git a/ui_tests/tests/test_splunk_integration.py b/ui_tests/tests/test_splunk_integration.py index 160592852..9e10da7d6 100644 --- a/ui_tests/tests/test_splunk_integration.py +++ b/ui_tests/tests/test_splunk_integration.py @@ -8,8 +8,8 @@ from pages.header_page import HeaderPage from pages.inventory_page import InventoryPage from pages.profiles_page import ProfilesPage -from webdriver.webriver_factory import WebDriverFactory from splunk_search import check_events_from_splunk +from webdriver.webriver_factory import WebDriverFactory logger = Logger().get_logger() driver = WebDriverFactory().get_driver() diff --git a/ui_tests/webdriver/webriver_factory.py b/ui_tests/webdriver/webriver_factory.py index e937ee2df..23d569d0f 100644 --- a/ui_tests/webdriver/webriver_factory.py +++ b/ui_tests/webdriver/webriver_factory.py @@ -3,9 +3,10 @@ import pytest from selenium import webdriver from selenium.webdriver.chrome.options import Options -import config.config as config from selenium.webdriver.chrome.service import Service as ChromeService from webdriver_manager.chrome import ChromeDriverManager + +import config.config as config from logger.logger import Logger logger = Logger().get_logger()