Merge pull request #1062 from jmchilton/test_fixes

[15.10] Test timeout fixes?

test/api/helpers.py

@@ -440,7 +440,7 @@ def _create_collection( self, payload ):
         return create_response
 
 
-def wait_on_state( state_func, assert_ok=False, timeout=5 ):
+def wait_on_state( state_func, assert_ok=False, timeout=DEFAULT_TIMEOUT ):
     def get_state( ):
         response = state_func()
         assert response.status_code == 200, "Failed to fetch state update while waiting."
@@ -454,12 +454,16 @@ def get_state( ):
     return wait_on( get_state, desc="state", timeout=timeout)
 
 
-def wait_on( function, desc, timeout=5 ):
+def wait_on( function, desc, timeout=DEFAULT_TIMEOUT ):
     delta = .25
     iteration = 0
     while True:
-        if (delta * iteration) > timeout:
-            assert False, "Timed out waiting on %s." % desc
+        total_wait = delta * iteration
+        if total_wait > timeout:
+            timeout_message = "Timed out after %s seconds waiting on %s." % (
+                total_wait, desc
+            )
+            assert False, timeout_message
         iteration += 1
         value = function()
         if value is not None:

test/api/test_workflow_extraction.py

@@ -357,7 +357,7 @@ def __setup_and_run_cat1_workflow( self, history_id ):
         run_workflow_response = self._post( "workflows", data=workflow_request )
         self._assert_status_code_is( run_workflow_response, 200 )
 
-        self.dataset_populator.wait_for_history( history_id, assert_ok=True, timeout=10 )
+        self.dataset_populator.wait_for_history( history_id, assert_ok=True )
         return self.__cat_job_id( history_id )
 
     def _assert_first_step_is_paired_input( self, downloaded_workflow ):