From bba322f471b26c58326cc9190b786709cb5814e0 Mon Sep 17 00:00:00 2001 From: Krishna Agarwal Date: Tue, 22 Oct 2024 12:06:32 -0700 Subject: [PATCH 1/4] Fix Logged in User Case Issue --- gen3-integration-tests/pages/login.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gen3-integration-tests/pages/login.py b/gen3-integration-tests/pages/login.py index 70f7d322..01031a2f 100644 --- a/gen3-integration-tests/pages/login.py +++ b/gen3-integration-tests/pages/login.py @@ -104,7 +104,7 @@ def login( ): page.locator(self.USER_PROFILE_DROPDOWN).click() expect( - page.locator(f'//div[contains(text(), "{logged_in_user}")]') + page.get_by_role("link").filter(has_text=logged_in_user) ).to_be_visible(timeout=10000) screenshot(page, "AfterLogin") self.handle_popup(page) From 4e00d56977264565ffbca1722e75e922bcec5ef2 Mon Sep 17 00:00:00 2001 From: Hara Prasad Juvvala Date: Thu, 24 Oct 2024 09:29:15 -0500 Subject: [PATCH 2/4] compare lower case of username in audit logs --- gen3-integration-tests/services/audit.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/gen3-integration-tests/services/audit.py b/gen3-integration-tests/services/audit.py index 20f88afc..62357960 100644 --- a/gen3-integration-tests/services/audit.py +++ b/gen3-integration-tests/services/audit.py @@ -47,7 +47,13 @@ def check_query_results(self, log_category, user, params, expected_results): logger.info(data["data"]) for key, val in expected_results.items(): # Get the first entry of json data - assert data["data"][0][key] == expected_results[key] + if key == "username": + assert ( + data["data"][0][key].lower() + == expected_results[key].lower() + ) + else: + assert data["data"][0][key] == expected_results[key] return True counter += 1 From 4eecf3c11e9f05a3e3912d6df4160d397b6e69e3 Mon Sep 17 00:00:00 2001 From: Hara Prasad Juvvala Date: Thu, 24 Oct 2024 11:07:09 -0500 Subject: [PATCH 3/4] verbose logging --- gen3-integration-tests/services/audit.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gen3-integration-tests/services/audit.py b/gen3-integration-tests/services/audit.py index 62357960..694233e9 100644 --- a/gen3-integration-tests/services/audit.py +++ b/gen3-integration-tests/services/audit.py @@ -51,9 +51,11 @@ def check_query_results(self, log_category, user, params, expected_results): assert ( data["data"][0][key].lower() == expected_results[key].lower() - ) + ), f"Expected {expected_results[key].lower()} but got {data['data'][0][key].lower()}" else: - assert data["data"][0][key] == expected_results[key] + assert ( + data["data"][0][key] == expected_results[key] + ), f"Expected {expected_results[key]} but got {data['data'][0][key]}" return True counter += 1 From 5823840ac50619165566779f7e77b59b5655b405 Mon Sep 17 00:00:00 2001 From: Hara Prasad Juvvala Date: Thu, 24 Oct 2024 13:14:43 -0500 Subject: [PATCH 4/4] fix --- gen3-integration-tests/services/audit.py | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/gen3-integration-tests/services/audit.py b/gen3-integration-tests/services/audit.py index 694233e9..e991d53d 100644 --- a/gen3-integration-tests/services/audit.py +++ b/gen3-integration-tests/services/audit.py @@ -1,6 +1,5 @@ import datetime import math -import os import pytest import time @@ -47,15 +46,7 @@ def check_query_results(self, log_category, user, params, expected_results): logger.info(data["data"]) for key, val in expected_results.items(): # Get the first entry of json data - if key == "username": - assert ( - data["data"][0][key].lower() - == expected_results[key].lower() - ), f"Expected {expected_results[key].lower()} but got {data['data'][0][key].lower()}" - else: - assert ( - data["data"][0][key] == expected_results[key] - ), f"Expected {expected_results[key]} but got {data['data'][0][key]}" + assert data["data"][0][key] == expected_results[key] return True counter += 1