Removed logging added for feature test failure. Added more assets to avoid false failures.
Yogesh Mahajan
GitHub
parent
83ec0f3d90
commit
026334a71a
|
|
@ -31,12 +31,10 @@ class BrowserToolBarFeatureTest(BaseFeatureTest):
|
|||
def before(self):
|
||||
self.page.wait_for_spinner_to_disappear()
|
||||
self.page.add_server(self.server)
|
||||
print("Added server", file=sys.stderr)
|
||||
self.test_table_name = "test_table" + str(
|
||||
secrets.choice(range(1000, 3000)))
|
||||
test_utils.create_table(self.server, self.test_db,
|
||||
self.test_table_name)
|
||||
print("before completed", file=sys.stderr)
|
||||
|
||||
def runTest(self):
|
||||
# Check for query tool button
|
||||
|
|
@ -63,9 +61,12 @@ class BrowserToolBarFeatureTest(BaseFeatureTest):
|
|||
self.test_table_name)
|
||||
|
||||
def test_query_tool_button(self):
|
||||
self.page.expand_database_node("Servers", self.server['name'],
|
||||
self.server['db_password'],
|
||||
self.test_db)
|
||||
self.assertTrue(self.page.expand_database_node("Servers",
|
||||
self.server['name'],
|
||||
self.server[
|
||||
'db_password'],
|
||||
self.test_db),
|
||||
'Tree is not expanded to database node')
|
||||
self.assertTrue(self.page.retry_click(
|
||||
(By.CSS_SELECTOR,
|
||||
BrowserToolBarLocators.open_query_tool_button_css),
|
||||
|
|
@ -74,9 +75,12 @@ class BrowserToolBarFeatureTest(BaseFeatureTest):
|
|||
self.page.close_query_tool(prompt=False)
|
||||
|
||||
def test_view_data_tool_button(self):
|
||||
self.page.expand_tables_node("Servers", self.server['name'],
|
||||
self.server['db_password'], self.test_db,
|
||||
"public")
|
||||
self.assertTrue(
|
||||
self.page.expand_tables_node("Servers", self.server['name'],
|
||||
self.server['db_password'],
|
||||
self.test_db,
|
||||
"public"),
|
||||
'Tree is not expanded to table node')
|
||||
|
||||
table_node = self.page.check_if_element_exists_with_scroll(
|
||||
TreeAreaLocators.table_node(self.test_table_name))
|
||||
|
|
|
|||
|
|
@ -40,6 +40,7 @@ class QueryToolJourneyTest(BaseFeatureTest):
|
|||
query_history_tab_id = "id-history"
|
||||
query_editor_tab_name = "Query Editor"
|
||||
query_editor_tab_id = "id-query"
|
||||
query_tool_opened = False
|
||||
|
||||
def before(self):
|
||||
self.test_table_name = "test_table" + str(
|
||||
|
|
@ -421,10 +422,12 @@ class QueryToolJourneyTest(BaseFeatureTest):
|
|||
self.page.click_modal('Yes')
|
||||
|
||||
def _navigate_to_query_tool(self):
|
||||
self.page.expand_database_node("Server", self.server['name'],
|
||||
self.server['db_password'],
|
||||
self.test_db)
|
||||
self.page.open_query_tool()
|
||||
self.assertTrue(
|
||||
self.page.expand_database_node("Server", self.server['name'],
|
||||
self.server['db_password'],
|
||||
self.test_db),
|
||||
'Tree is not expanded to database node')
|
||||
self.query_tool_opened = self.page.open_query_tool()
|
||||
self.page.wait_for_spinner_to_disappear()
|
||||
|
||||
def _explain_query(self, query):
|
||||
|
|
@ -498,7 +501,8 @@ class QueryToolJourneyTest(BaseFeatureTest):
|
|||
QueryToolLocators.new_row_xpath)
|
||||
|
||||
def after(self):
|
||||
self.page.close_query_tool()
|
||||
if self.query_tool_opened:
|
||||
self.page.close_query_tool()
|
||||
test_utils.delete_table(
|
||||
self.server, self.test_db, self.test_table_name)
|
||||
test_utils.delete_table(
|
||||
|
|
|
|||
|
|
@ -38,7 +38,6 @@ class BaseFeatureTest(BaseTestGenerator):
|
|||
try:
|
||||
if self.parallel_ui_tests:
|
||||
self.page.login_to_app(self.server['login_details'])
|
||||
print("Login successful", file=sys.stderr)
|
||||
test_utils.reset_layout_db()
|
||||
self.page.driver.switch_to.default_content()
|
||||
self.page.wait_for_app()
|
||||
|
|
|
|||
|
|
@ -1371,7 +1371,6 @@ def launch_url_in_browser(driver_instance, url, title='pgAdmin 4', timeout=50):
|
|||
driver_instance.get(url)
|
||||
wait = WebDriverWait(driver_instance, 10)
|
||||
wait.until(ec.title_is(title))
|
||||
print("pgAdmin launched in browser", file=sys.stderr)
|
||||
break
|
||||
except WebDriverException as e:
|
||||
time.sleep(6)
|
||||
|
|
|
|||
|
|
@ -599,11 +599,9 @@ def run_parallel_tests(url_client, servers_details, parallel_tests_lists,
|
|||
threads_list = []
|
||||
# Create thread for each server
|
||||
for ser in servers_details:
|
||||
print("Running for ser", ser['name'], file=sys.stderr)
|
||||
while True:
|
||||
# If active thread count <= max_thread_count, add new thread
|
||||
if threading.active_count() <= max_thread_count:
|
||||
print("Created a thread", file=sys.stderr)
|
||||
# Get remote web-driver instance at server level
|
||||
driver_object = \
|
||||
test_utils.get_remote_webdriver(hub_url,
|
||||
|
|
@ -865,17 +863,12 @@ if __name__ == '__main__':
|
|||
file=sys.stderr)
|
||||
|
||||
time.sleep(int(pgAdmin_wait_time))
|
||||
print('pgAdmin sleep for debug over',
|
||||
file=sys.stderr)
|
||||
|
||||
# Running Parallel tests
|
||||
if len(parallel_tests) > 0:
|
||||
parallel_sessions = \
|
||||
int(selenoid_config[
|
||||
'max_parallel_sessions'])
|
||||
print("Running parallel test", file=sys.stderr)
|
||||
print("parallel_sessions = ",
|
||||
parallel_sessions, file=sys.stderr)
|
||||
|
||||
run_parallel_tests(
|
||||
client_url, servers_info, parallel_tests,
|
||||
|
|
|
|||
Loading…
Reference in New Issue