[ticket/16078] Use while loop for visit retries

PHPBB3-16078

1 files changed, 10 insertions, 7 deletions

diff --git a/tests/test_framework/phpbb_ui_test_case.php b/tests/test_framework/phpbb_ui_test_case.php
index e7c9bd4d0b..48e510abe3 100644
--- a/tests/test_framework/phpbb_ui_test_case.php
+++ b/tests/test_framework/phpbb_ui_test_case.php
@@ -159,20 +159,23 @@ class phpbb_ui_test_case extends phpbb_test_case
 	public function visit($path)
 	{
 		// Retry three times on curl issues, e.g. timeout
-		try
-		{
-			$this->getDriver()->get(self::$root_url . $path);
-		}
-		catch (Facebook\WebDriver\Exception\WebDriverCurlException $exception)
+		$attempts = 0;
+		$retries = 3;
+
+		while (true)
 		{
+			$attempts++;
 			try
 			{
 				$this->getDriver()->get(self::$root_url . $path);
+				break;
 			}
 			catch (Facebook\WebDriver\Exception\WebDriverCurlException $exception)
 			{
-				// Last try, throw exception after this one fails
-				$this->getDriver()->get(self::$root_url . $path);
+				if ($attempts >= $retries)
+				{
+					throw $exception;
+				}
 			}
 		}
 	}