fix cqls for selenium

Author: admin

app/locustio/confluence/requests_params.py

@@ -1,15 +1,13 @@
 # flake8: noqa
 from locustio.common_utils import read_input_file, BaseResource
-from util.project_paths import (CONFLUENCE_PAGES, CONFLUENCE_BLOGS, CONFLUENCE_USERS, CONFLUENCE_STATIC_CONTENT,
-                                CONFLUENCE_CQLS)
+from util.project_paths import (CONFLUENCE_PAGES, CONFLUENCE_BLOGS, CONFLUENCE_USERS, CONFLUENCE_STATIC_CONTENT)
 
 
 def confluence_datasets():
     data_sets = dict()
     data_sets["pages"] = read_input_file(CONFLUENCE_PAGES)
     data_sets["blogs"] = read_input_file(CONFLUENCE_BLOGS)
     data_sets["users"] = read_input_file(CONFLUENCE_USERS)
-    data_sets["cqls"] = read_input_file(CONFLUENCE_CQLS)
     data_sets['static-content'] = read_input_file(CONFLUENCE_STATIC_CONTENT)
 
     return data_sets

app/selenium_ui/confluence/modules.py

@@ -303,19 +303,19 @@ def sub_measure():
     measure()
 
 def cql_search_three_words(webdriver):
-    return cql_search(webdriver, cql_string=THREE_WORDS_CQL)
+    return cql_search(webdriver, cql_string=THREE_WORDS_CQL, print_timing_suffix='3_words')
 
 
 def cql_search_two_words(webdriver):
-    return cql_search(webdriver, cql_string=TWO_WORDS_CQL)
+    return cql_search(webdriver, cql_string=TWO_WORDS_CQL, print_timing_suffix='2_words')
 
 
-def cql_search(webdriver, cql_string):
+def cql_search(webdriver, cql_string, print_timing_suffix):
     page = Page(webdriver)
     page.wait_until_visible(PageLocators.search_box)
     PopupManager(webdriver).dismiss_default_popup()
 
-    @print_timing("selenium_cql_search")
+    @print_timing(f"selenium_cql_search_{print_timing_suffix}")
     def measure():
         page.get_element(PageLocators.search_box).send_keys(cql_string)
         page.wait_until_any_ec_presented((PageLocators.empty_search_results, PageLocators.search_results),

app/selenium_ui/conftest.py

@@ -24,7 +24,7 @@
     BITBUCKET_PROJECTS, BITBUCKET_REPOS, BITBUCKET_PRS, CONFLUENCE_BLOGS, CONFLUENCE_PAGES, CONFLUENCE_CUSTOM_PAGES, \
     CONFLUENCE_USERS, ENV_TAURUS_ARTIFACT_DIR, JSM_DATASET_REQUESTS, JSM_DATASET_CUSTOMERS, JSM_DATASET_AGENTS, \
     JSM_DATASET_SERVICE_DESKS_L, JSM_DATASET_SERVICE_DESKS_M, JSM_DATASET_SERVICE_DESKS_S, JSM_DATASET_CUSTOM_ISSUES, \
-    JSM_DATASET_INSIGHT_SCHEMAS, JSM_DATASET_INSIGHT_ISSUES, BAMBOO_USERS, BAMBOO_BUILD_PLANS, CONFLUENCE_CQLS
+    JSM_DATASET_INSIGHT_SCHEMAS, JSM_DATASET_INSIGHT_ISSUES, BAMBOO_USERS, BAMBOO_BUILD_PLANS
 
 SCREEN_WIDTH = 1920
 SCREEN_HEIGHT = 1080
@@ -87,7 +87,6 @@ def confluence_dataset(self):
             self.dataset["pages"] = self.__read_input_file(CONFLUENCE_PAGES)
             self.dataset["blogs"] = self.__read_input_file(CONFLUENCE_BLOGS)
             self.dataset["users"] = self.__read_input_file(CONFLUENCE_USERS)
-            self.dataset["cqls"] = self.__read_input_file(CONFLUENCE_CQLS)
             self.dataset["custom_pages"] = self.__read_input_file(
                 CONFLUENCE_CUSTOM_PAGES)
         return self.dataset

app/util/data_preparation/confluence_prepare_data.py

@@ -8,7 +8,7 @@
 from util.api.confluence_clients import ConfluenceRpcClient, ConfluenceRestClient
 from util.common_util import print_timing
 from util.conf import CONFLUENCE_SETTINGS
-from util.project_paths import (CONFLUENCE_USERS, CONFLUENCE_PAGES, CONFLUENCE_BLOGS, CONFLUENCE_CQLS,
+from util.project_paths import (CONFLUENCE_USERS, CONFLUENCE_PAGES, CONFLUENCE_BLOGS,
                                 CONFLUENCE_CUSTOM_PAGES, CONFLUENCE_WORDS)
 
 __warnings_filter()

app/util/project_paths.py

@@ -121,7 +121,6 @@ def __get_default_test_actions():
 CONFLUENCE_USERS = __get_confluence_dataset('users.csv')
 CONFLUENCE_PAGES = __get_confluence_dataset('pages.csv')
 CONFLUENCE_BLOGS = __get_confluence_dataset('blogs.csv')
-CONFLUENCE_CQLS = __get_confluence_dataset('cqls.csv')
 CONFLUENCE_STATIC_CONTENT = __get_confluence_dataset('static-content/files_upload.csv')
 CONFLUENCE_CUSTOM_PAGES = __get_confluence_dataset('custom_pages.csv')
 CONFLUENCE_WORDS = __get_confluence_dataset('static-content/words.csv')