hardcode for cql

Author: admin

app/locustio/confluence/http_actions.py

@@ -12,6 +12,9 @@
 logger = init_logger(app_type='confluence')
 confluence_dataset = confluence_datasets()
 
+TWO_WORDS_CQL = 'confluence agreement'
+THREE_WORDS_CQL = 'shoulder trip discussion'
+
 
 @confluence_measure('locust_login_and_view_dashboard')
 def login_and_view_dashboard(locust):
@@ -402,9 +405,8 @@ def view_blog(locust):
                catch_response=True)
 
 
-def search_cql_and_view_results(locust):
+def search_cql_two_words_and_view_results(locust):
     raise_if_login_failed(locust)
-    cql = random.choice(confluence_dataset["cqls"])[0]
 
     @confluence_measure('locust_search_cql:recently_viewed')
     def search_recently_viewed():
@@ -413,11 +415,11 @@ def search_recently_viewed():
                    '?limit=8',
                    catch_response=True)
 
-    @confluence_measure('locust_search_cql:search_results')
+    @confluence_measure('locust_search_cql:search_results_2_words')
     def search_cql():
         # 530 rest/api/search
         r = locust.get(f"/rest/api/search"
-                       f"?cql=siteSearch~'{cql}'"
+                       f"?cql=siteSearch~'{TWO_WORDS_CQL}'"
                        f"&start=0"
                        f"&limit=20",
                        catch_response=True)
@@ -435,6 +437,31 @@ def search_cql():
     search_recently_viewed()
     search_cql()
 
+def search_cql_three_words(locust):
+    raise_if_login_failed(locust)
+
+    @confluence_measure('locust_search_cql:search_results_3_words')
+    def search_cql():
+        # 530 rest/api/search
+        r = locust.get(f"/rest/api/search"
+                       f"?cql=siteSearch~'{THREE_WORDS_CQL}'"
+                       f"&start=0"
+                       f"&limit=20",
+                       catch_response=True)
+
+        if '{"results":[' not in r.content.decode('utf-8'):
+            logger.locust_info(r.content.decode('utf-8'))
+        content = r.content.decode('utf-8')
+        if 'results' not in content:
+            logger.error(f"Search cql failed: {content}")
+        assert 'results' in content, "Search cql failed."
+
+        # 540 rest/mywork/latest/status/notification/count
+        locust.get('/rest/mywork/latest/status/notification/count', catch_response=True)
+
+    search_cql()
+
+
 
 def open_editor_and_create_blog(locust):
     params = CreateBlog()

app/locustio/confluence/locustfile.py

@@ -30,7 +30,11 @@ def view_blog_action(self):
 
     @task(config.percentage('search_cql'))
     def search_cql_action(self):
-        search_cql_and_view_results(self)
+        search_cql_two_words_and_view_results(self)
+
+    @task(config.percentage('search_cql'))
+    def search_cql_action(self):
+        search_cql_three_words(self)
 
     @task(config.percentage('create_blog'))
     def create_blog_action(self):

app/selenium_ui/confluence/modules.py

@@ -13,7 +13,8 @@
 CQLS = "cqls"
 CUSTOM_PAGES = "custom_pages"
 BLOGS = "blogs"
-
+TWO_WORDS_CQL = 'confluence agreement'
+THREE_WORDS_CQL = 'shoulder trip discussion'
 
 def setup_run_data(datasets):
     datasets['current_session'] = {}
@@ -301,16 +302,15 @@ def sub_measure():
 
     measure()
 
-def cql_search_three_words(webdriver, datasets):
-    cql_search(webdriver, datasets, cql_string='shoulder trip discussion')
+def cql_search_three_words(webdriver):
+    return cql_search(webdriver, cql_string=THREE_WORDS_CQL)
 
 
-def cql_search_two_words(webdriver, datasets):
-    cql_search(webdriver, datasets, cql_string='confluence agreement')
+def cql_search_two_words(webdriver):
+    return cql_search(webdriver, cql_string=TWO_WORDS_CQL)
 
 
-def cql_search(webdriver, datasets, cql_string):
-    random_cql = random.choice(datasets[CQLS])
+def cql_search(webdriver, cql_string):
     page = Page(webdriver)
     page.wait_until_visible(PageLocators.search_box)
     PopupManager(webdriver).dismiss_default_popup()

app/selenium_ui/confluence_ui.py

@@ -22,9 +22,6 @@ def test_1_selenium_view_page(confluence_webdriver, confluence_datasets, conflue
 def test_1_selenium_view_page_from_cache(confluence_webdriver, confluence_datasets, confluence_screen_shots):
     modules.view_page_from_cache(confluence_webdriver, confluence_datasets)
 
-def test_1_selenium_cql_search_two_words(confluence_webdriver, confluence_datasets, confluence_screen_shots):
-    modules.cql_search_two_words(confluence_webdriver, confluence_datasets)
-
 def test_1_selenium_create_page(confluence_webdriver, confluence_datasets, confluence_screen_shots):
     modules.create_confluence_page(confluence_webdriver, confluence_datasets)
 
@@ -33,6 +30,10 @@ def test_1_selenium_edit_by_url(confluence_webdriver, confluence_datasets, confl
     modules.edit_confluence_page_by_url(confluence_webdriver, confluence_datasets)
 
 
+def test_1_selenium_cql_search_two_words(confluence_webdriver, confluence_datasets, confluence_screen_shots):
+    modules.cql_search_two_words(confluence_webdriver)
+
+
 def test_1_selenium_edit_page_quick_edit(confluence_webdriver, confluence_datasets, confluence_screen_shots):
     modules.edit_confluence_page_quick_edit(confluence_webdriver, confluence_datasets)
 
@@ -42,7 +43,7 @@ def test_1_selenium_create_inline_comment(confluence_webdriver, confluence_datas
 
 
 def test_1_selenium_cql_search_three_words(confluence_webdriver, confluence_datasets, confluence_screen_shots):
-    modules.cql_search_three_words(confluence_webdriver, confluence_datasets)
+    modules.cql_search_three_words(confluence_webdriver)
 
 
 

app/util/data_preparation/confluence_prepare_data.py

@@ -76,8 +76,6 @@ def __create_data_set(rest_client, rpc_client):
     dataset[PAGES] = async_pages.get()
     dataset[BLOGS] = async_blogs.get()
 
-    dataset[CQLS] = __generate_cqls(words_count=CQL_WORDS_COUNT)
-
     dataset[CUSTOM_PAGES] = __get_custom_pages(perf_user_api, 5000, CONFLUENCE_SETTINGS.custom_dataset_query)
     print(f'Users count: {len(dataset[USERS])}')
     print(f'Pages count: {len(dataset[PAGES])}')
@@ -211,8 +209,6 @@ def write_test_data_to_files(dataset):
     users = [f"{user['user']['username']},{DEFAULT_USER_PASSWORD}" for user in dataset[USERS]]
     __write_to_file(CONFLUENCE_USERS, users)
 
-    __write_to_file(CONFLUENCE_CQLS, dataset[CQLS])
-
     custom_pages = [f"{page['id']},{page['space']['key']}" for page in dataset[CUSTOM_PAGES]]
     __write_to_file(CONFLUENCE_CUSTOM_PAGES, custom_pages)