From 7a11fa032b07d584828b5192243cd7995253540a Mon Sep 17 00:00:00 2001 From: Keyur Shah Date: Wed, 14 Aug 2024 10:38:22 -0700 Subject: [PATCH 1/2] Use url from env for running cdc tests. --- server/webdriver/cdc_tests/autopush_test.py | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/server/webdriver/cdc_tests/autopush_test.py b/server/webdriver/cdc_tests/autopush_test.py index 099b69379d..339e235bb2 100644 --- a/server/webdriver/cdc_tests/autopush_test.py +++ b/server/webdriver/cdc_tests/autopush_test.py @@ -12,6 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. +import os import unittest from selenium.webdriver.common.by import By @@ -23,7 +24,12 @@ from server.webdriver.base_utils import wait_elem # From project datcom-website-dev > Cloud Run: dc-autopush > Revisions -CDC_AUTOPUSH_URL = 'https://dc-autopush-kqb7thiuka-uc.a.run.app' +DEFAULT_CDC_TEST_BASE_URL = 'https://dc-autopush-kqb7thiuka-uc.a.run.app' + +# Get base test url from the CDC_TEST_BASE_URL env variable, defaulting to DEFAULT_CDC_TEST_BASE_URL +CDC_TEST_BASE_URL = os.environ.get('CDC_TEST_BASE_URL', + DEFAULT_CDC_TEST_BASE_URL) +print(f'Running CDC tests against base URL: {CDC_TEST_BASE_URL}') class CdcAutopushWebdriverTest(unittest.TestCase): @@ -33,7 +39,7 @@ def setUp(self, preferences=None): # Maximum time, in seconds, before throwing a TimeoutException. self.TIMEOUT_SEC = shared.TIMEOUT self.driver = create_driver(preferences) - self._base_url = CDC_AUTOPUSH_URL + self._base_url = CDC_TEST_BASE_URL def tearDown(self): """Runs at the end of every individual test.""" @@ -70,7 +76,7 @@ def test_statvar_explorer(self): class CdcAutopushNLTest(ExploreTest): def get_server_url(self): - return CDC_AUTOPUSH_URL + return CDC_TEST_BASE_URL def test_cdc_nl(self): self.run_detect_and_fulfill('cdc_nl', ['gender wage gap in europe']) From 80f88fbdb18533de9d70d4df8901f7db2f6a6349 Mon Sep 17 00:00:00 2001 From: Keyur Shah Date: Thu, 15 Aug 2024 09:31:54 -0700 Subject: [PATCH 2/2] Address review comments. --- .../webdriver/cdc_tests/{autopush_test.py => cdc_test.py} | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) rename server/webdriver/cdc_tests/{autopush_test.py => cdc_test.py} (94%) diff --git a/server/webdriver/cdc_tests/autopush_test.py b/server/webdriver/cdc_tests/cdc_test.py similarity index 94% rename from server/webdriver/cdc_tests/autopush_test.py rename to server/webdriver/cdc_tests/cdc_test.py index 339e235bb2..0b16b34adb 100644 --- a/server/webdriver/cdc_tests/autopush_test.py +++ b/server/webdriver/cdc_tests/cdc_test.py @@ -23,6 +23,8 @@ from server.webdriver.base_utils import find_elem from server.webdriver.base_utils import wait_elem +# The tests in this file can be run with any CDC instance loaded with sample data from the custom_dc/sample folder. + # From project datcom-website-dev > Cloud Run: dc-autopush > Revisions DEFAULT_CDC_TEST_BASE_URL = 'https://dc-autopush-kqb7thiuka-uc.a.run.app' @@ -32,7 +34,7 @@ print(f'Running CDC tests against base URL: {CDC_TEST_BASE_URL}') -class CdcAutopushWebdriverTest(unittest.TestCase): +class CdcWebdriverTest(unittest.TestCase): def setUp(self, preferences=None): """Runs at the beginning of every individual test.""" @@ -73,7 +75,7 @@ def test_statvar_explorer(self): 'Custom SV (Average Annual Wage) element not found') -class CdcAutopushNLTest(ExploreTest): +class CdcNLTest(ExploreTest): def get_server_url(self): return CDC_TEST_BASE_URL