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 intermittent feature test failures.

Browse Source
This commit is contained in:
Yogesh Mahajan
2022-11-29 17:35:07 +05:30
committed by GitHub
parent 83bfdf9b3c
commit 7b96bf857c
5 changed files with 26 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
web/regression/feature_tests/query_tool_journey_test.py
View File

@@ -487,7 +487,6 @@ class QueryToolJourneyTest(BaseFeatureTest):
retry), file=sys.stderr) retry), file=sys.stderr)
retry -= 1 retry -= 1
except Exception as e: except Exception as e:
traceback.print_exc()
print('Exception while reading cell value in try ' + print('Exception while reading cell value in try ' +
str(retry), file=sys.stderr) str(retry), file=sys.stderr)
retry -= 1 retry -= 1

3
web/regression/feature_tests/table_ddl_feature_test.py
View File

@@ -37,6 +37,9 @@ class TableDdlFeatureTest(BaseFeatureTest):
'public') 'public')
table_node = self.page.check_if_element_exists_with_scroll( table_node = self.page.check_if_element_exists_with_scroll(
TreeAreaLocators.table_node(self.test_table_name)) TreeAreaLocators.table_node(self.test_table_name))
self.assertTrue(bool(table_node), 'Table node not found.')
table_node.click() table_node.click()
self.page.click_tab("SQL") self.page.click_tab("SQL")

4
web/regression/feature_tests/view_data_dml_queries.py
View File

@@ -264,7 +264,6 @@ CREATE TABLE public.nonintpkey
print('Cell is NOT selected yet.', file=sys.stderr) print('Cell is NOT selected yet.', file=sys.stderr)
return False return False
except Exception: except Exception:
traceback.print_exc()
print('Exception occurred while updating int cell', print('Exception occurred while updating int cell',
file=sys.stderr) file=sys.stderr)
return False return False
@@ -284,7 +283,6 @@ CREATE TABLE public.nonintpkey
QueryToolLocators.text_editor_ok_btn_css).click() QueryToolLocators.text_editor_ok_btn_css).click()
return True return True
except Exception: except Exception:
traceback.print_exc()
print('Exception occurred while updating text cell ', print('Exception occurred while updating text cell ',
file=sys.stderr) file=sys.stderr)
return False return False
@@ -313,7 +311,6 @@ CREATE TABLE public.nonintpkey
QueryToolLocators.text_editor_ok_btn_css).click() QueryToolLocators.text_editor_ok_btn_css).click()
return True return True
except Exception: except Exception:
traceback.print_exc()
print('Exception occurred while updating json cell ', print('Exception occurred while updating json cell ',
file=sys.stderr) file=sys.stderr)
return False return False
@@ -333,7 +330,6 @@ CREATE TABLE public.nonintpkey
ActionChains(self.driver).click(checkbox_el).perform() ActionChains(self.driver).click(checkbox_el).perform()
return True return True
except Exception: except Exception:
traceback.print_exc()
print('Exception occurred while updating boolean cell', print('Exception occurred while updating boolean cell',
file=sys.stderr) file=sys.stderr)
return False return False

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

@@ -339,16 +339,22 @@ class PgadminPage:
file=sys.stderr) file=sys.stderr)
def click_to_expand_tree_node(self, tree_node_web_element, def click_to_expand_tree_node(self, tree_node_web_element,
tree_node_exp_check_xpath): tree_node_exp_check_xpath,
schema_child_node_expand_icon_xpath=None):
""" """
Method clicks passed webelement to expand specified tree node Method clicks passed webelement to expand specified tree node
:param tree_node_web_element: :param tree_node_web_element:
:param tree_node_exp_check_xpath: :param tree_node_exp_check_xpath:
:param schema_child_node_expand_icon_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 retry = 2
while retry > 0: while retry > 0:
try: try:
if retry == 1:
webdriver.ActionChains.click(
schema_child_node_expand_icon_xpath).perform()
else:
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( if self.check_if_element_exist_by_xpath(
@@ -562,6 +568,8 @@ class PgadminPage:
server_name, 'Databases') server_name, 'Databases')
databases_node = self.check_if_element_exists_with_scroll( databases_node = self.check_if_element_exists_with_scroll(
databases_node_xpath) databases_node_xpath)
webdriver.ActionChains(self.driver).move_to_element(
databases_node).perform()
webdriver.ActionChains(self.driver).double_click( webdriver.ActionChains(self.driver).double_click(
databases_node).perform() databases_node).perform()
child_node_ele = self.check_if_element_exists_with_scroll( child_node_ele = self.check_if_element_exists_with_scroll(
@@ -729,9 +737,10 @@ class PgadminPage:
schema_child_expanded = False schema_child_expanded = False
schema_child_node_xpath = TreeAreaLocators. \ schema_child_node_xpath = TreeAreaLocators. \
schema_child_node(schema_name, schema_child_node_name) schema_child_node(schema_name, schema_child_node_name)
schema_child_node_expand_icon_xpath = TreeAreaLocators. \
schema_child_node(schema_name, schema_child_node_name)
schema_child_node_exp_status_check_xpath = TreeAreaLocators. \ schema_child_node_exp_status_check_xpath = TreeAreaLocators. \
schema_child_node_exp_status(schema_name, schema_child_node_name) schema_child_node_exp_status(schema_name, schema_child_node_name)
if self.expand_schema_node(server_group_name, server_name, if self.expand_schema_node(server_group_name, server_name,
server_password, database_name, server_password, database_name,
schema_name): schema_name):
@@ -744,7 +753,8 @@ class PgadminPage:
else: else:
schema_child_expanded = self.click_to_expand_tree_node( schema_child_expanded = self.click_to_expand_tree_node(
child_node_ele, child_node_ele,
schema_child_node_exp_status_check_xpath) schema_child_node_exp_status_check_xpath,
schema_child_node_expand_icon_xpath)
else: else:
print("%s node not found - ", schema_child_node_name, print("%s node not found - ", schema_child_node_name,
file=sys.stderr) file=sys.stderr)
@@ -1089,6 +1099,8 @@ class PgadminPage:
ele = WebDriverWait(self.driver, 1, 0.01).until( ele = WebDriverWait(self.driver, 1, 0.01).until(
lambda d: d.find_element(By.XPATH, xpath)) lambda d: d.find_element(By.XPATH, xpath))
f_scroll, r_scroll = 0, 0 f_scroll, r_scroll = 0, 0
webdriver.ActionChains(self.driver).move_to_element(ele).\
perform()
return ele return ele
except (TimeoutException, NoSuchElementException): except (TimeoutException, NoSuchElementException):
tree_height = int((self.driver.find_element( tree_height = int((self.driver.find_element(

6
web/regression/feature_utils/tree_area_locators.py
View File

@@ -115,6 +115,12 @@ class TreeAreaLocators:
def schema_child_node(schema_name, child_node_name): def schema_child_node(schema_name, child_node_name):
return TreeAreaLocators.child_node % (schema_name, child_node_name) return TreeAreaLocators.child_node % (schema_name, child_node_name)
@staticmethod
def schema_child_node_expand_icon_xpath(schema_name, child_node_name):
return "//div[div[span[span[starts-with(text(),'%s')]]]]/" \
"following-sibling::div//span[text()='%s']/../" \
"preceding-sibling::i" % (schema_name, child_node_name)
# Database child # Database child
@staticmethod @staticmethod
def database_child_node_exp_status(database_name, child_node_name): def database_child_node_exp_status(database_name, child_node_name):