From 6fd6595238b5189e89f54ad01079b4d34fbcfea7 Mon Sep 17 00:00:00 2001 From: John Chilton Date: Thu, 14 Dec 2017 08:21:46 -0500 Subject: [PATCH] Another try to fix flakey tool form Selenium test. --- test/galaxy_selenium/navigates_galaxy.py | 3 --- test/selenium_tests/test_tool_form.py | 6 +++++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/test/galaxy_selenium/navigates_galaxy.py b/test/galaxy_selenium/navigates_galaxy.py index 30a37e384b3..1d20c179d9a 100644 --- a/test/galaxy_selenium/navigates_galaxy.py +++ b/test/galaxy_selenium/navigates_galaxy.py @@ -471,9 +471,6 @@ class NavigatesGalaxy(HasDriver): self.upload_queue_local_file(test_path) - # Having some problems with extension not being set properly. - self.sleep_for(WAIT_TYPES.UX_RENDER) - if ext is not None: self.wait_for_selector_visible('.upload-extension') self.select2_set_value(".upload-extension", ext) diff --git a/test/selenium_tests/test_tool_form.py b/test/selenium_tests/test_tool_form.py index e46aa582809..d880f682beb 100644 --- a/test/selenium_tests/test_tool_form.py +++ b/test/selenium_tests/test_tool_form.py @@ -1,3 +1,4 @@ +from base.populators import flakey from galaxy_selenium.navigates_galaxy import retry_call_during_transitions from .framework import ( @@ -84,13 +85,16 @@ class ToolFormTestCase(SeleniumTestCase, UsesHistoryItemAssertions): self.history_panel_wait_for_hid_ok(2) self._check_dataset_details_for_inttest_value(2) + @flakey @selenium_test def test_run_data(self): test_path = self.get_filename("1.fasta") test_path_decoy = self.get_filename("1.txt") + # Upload form posts bad data if executed two times in a row like this, so + # wait between uploads. xref https://github.com/galaxyproject/galaxy/issues/5169 self.perform_upload(test_path) - self.perform_upload(test_path_decoy) self.history_panel_wait_for_hid_ok(1) + self.perform_upload(test_path_decoy) self.history_panel_wait_for_hid_ok(2) self.home()