Merge pull request #29104 from owncloud/ui-test-timers

Set a minimum timeout for UI test waits
owncloud · Sep 28, 2017 · 910716b · 910716b
2 parents 336789a + d262810
commit 910716b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/tests/ui/features/bootstrap/bootstrap.php b/tests/ui/features/bootstrap/bootstrap.php
@@ -34,3 +34,5 @@
 
 // Default timeout for use in code that needs to wait for the UI
 const STANDARDUIWAITTIMEOUTMILLISEC = 10000;
+// Minimum timeout for use in code that needs to wait for the UI
+const MINIMUMUIWAITTIMEOUTMILLISEC = 500;
diff --git a/tests/ui/features/lib/OwncloudPage.php b/tests/ui/features/lib/OwncloudPage.php
@@ -342,6 +342,7 @@ public function waitForAjaxCallsToStartAndFinish(
 		$this->waitForAjaxCallsToStart($session);
 		$end = microtime(true);
 		$timeout_msec = $timeout_msec - (($end - $start) * 1000);
+		$timeout_msec = max($timeout_msec, MINIMUMUIWAITTIMEOUTMILLISEC);
 		$this->waitForOutstandingAjaxCalls($session, $timeout_msec);
 	}
 
@@ -403,4 +404,4 @@ protected function cleanInputAndSetValue(NodeElement $inputField, $value) {
 			throw new \Exception("value of input field is not what we expect");
 		}
 	}
-}
+}