IntenseWebs/pgadmin4
3
0
Fork 0
mirror of https://github.com/pgadmin-org/pgadmin4.git synced 2025-02-25 18:55:31 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fixed feature test failures due to React porting of backup dialog.

Browse Source
This commit is contained in:
Yogesh Mahajan
2021-11-23 17:36:10 +05:30
committed by Akshay Joshi
parent 43176a8c6f
commit 19984d6563
3 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
web/pgadmin/feature_tests/pg_utilities_backup_restore_test.py
View File

@@ -88,7 +88,7 @@ class PGUtilitiesBackupFeatureTest(BaseFeatureTest):
NavMenuLocators.process_watcher_alertfier)) NavMenuLocators.process_watcher_alertfier))
self.page.wait_for_element_to_disappear( self.page.wait_for_element_to_disappear(
lambda driver: driver.find_element( lambda driver: driver.find_element(
By.CSS_SELECTOR, ".loading-logs"), 18) By.CSS_SELECTOR, ".loading-logs"), 15)
expected_backup_success_msg = "Successfully completed." expected_backup_success_msg = "Successfully completed."
self.assertEqual(status, expected_backup_success_msg) self.assertEqual(status, expected_backup_success_msg)
@@ -204,13 +204,14 @@ class PGUtilitiesBackupFeatureTest(BaseFeatureTest):
element.click() element.click()
self.page.fill_input_by_field_name( self.page.fill_input_by_field_name(
NavMenuLocators.backup_filename_txt_box_name, NavMenuLocators.backup_filename_txt_box_name,
"test_backup", loose_focus=True) "test_backup", input_keys=True, loose_focus=True)
# Click on the take Backup button # Click on the take Backup button
take_bckup = self.page.find_by_xpath( take_bckup = self.page.find_by_xpath(
NavMenuLocators.backup_btn_xpath) NavMenuLocators.backup_btn_xpath)
click = True click = True
while click: retry = 3
while click and retry > 0:
try: try:
take_bckup.click() take_bckup.click()
if self.page.wait_for_element_to_disappear( if self.page.wait_for_element_to_disappear(
@@ -219,6 +220,7 @@ class PGUtilitiesBackupFeatureTest(BaseFeatureTest):
NavMenuLocators.backup_filename_txt_box_name)): NavMenuLocators.backup_filename_txt_box_name)):
click = False click = False
except Exception: except Exception:
retry -= 1
pass pass
def initiate_restore(self): def initiate_restore(self):

2
web/regression/feature_utils/locators.py
View File

@@ -78,7 +78,7 @@ class NavMenuLocators:
restore_file_name_txt_box_name = "file" restore_file_name_txt_box_name = "file"
backup_btn_xpath = \ backup_btn_xpath = \
"//button[contains(@class,'fa-save')and contains(.,'Backup')]" "//button[ contains(.,'Backup')]"
bcg_process_status_alertifier_css = \ bcg_process_status_alertifier_css = \
".ajs-message.ajs-bg-bgprocess.ajs-visible" ".ajs-message.ajs-bg-bgprocess.ajs-visible"

7
web/regression/feature_utils/pgadmin_page.py
View File

@@ -384,12 +384,17 @@ class PgadminPage:
:param tree_node_exp_check_xpath: :param tree_node_exp_check_xpath:
:return: True is tree_node_exp_check_xpath present in DOM else false :return: True is tree_node_exp_check_xpath present in DOM else false
""" """
retry = 2
while retry > 0:
webdriver.ActionChains(self.driver).double_click( webdriver.ActionChains(self.driver).double_click(
tree_node_web_element).perform() tree_node_web_element).perform()
if self.check_if_element_exist_by_xpath(tree_node_exp_check_xpath): if self.check_if_element_exist_by_xpath(tree_node_exp_check_xpath):
return True return True
else: elif retry == 1:
return False return False
else:
time.sleep(1)
retry -= 1
def expand_server_group_node(self, server_group_name): def expand_server_group_node(self, server_group_name):
""" """