Adding retries to tests

Author: Matt Gaunt

tests/PushServiceTest.php

@@ -33,7 +33,7 @@ class PushServiceTest extends PHPUnit_Framework_TestCase
      * detect current OS, we can probably run this automatically
      * for Linux and OS X at a later date.
      */
-    /** protected function checkRequirements()
+    /**protected function checkRequirements()
     {
         parent::checkRequirements();
 
@@ -104,12 +104,37 @@ public function browserProvider()
         );
     }
 
+    /**
+     * Selenium tests are flakey so add retries.
+     */
+    public function retryTest($retryCount, $test)
+    {
+      // just like above without checking the annotation
+      for ($i = 0; $i < $retryCount; $i++) {
+        try {
+            $test();
+            return;
+        }
+        catch (Exception $e) {
+            // last one thrown below
+        }
+      }
+      if ($e) {
+        throw $e;
+      }
+    }
+
     /**
      * @dataProvider browserProvider
      * Run integration tests with browsers
      */
     public function testBrowsers($browserId, $browserVersion, $options)
     {
+        $this->retryTest(4, $this->createClosureTest($browserId, $browserVersion, $options));
+    }
+
+    protected function createClosureTest($browserId, $browserVersion, $options) {
+      return function() use ($browserId, $browserVersion, $options) {
         $this->webPush = new WebPush($options);
         $this->webPush->setAutomaticPadding(false);
 
@@ -140,14 +165,23 @@ public function testBrowsers($browserId, $browserVersion, $options)
             ),
             CURLOPT_TIMEOUT => 30,
         ));
-
         $resp = curl_exec($getSubscriptionCurl);
 
         // Close request to clear up some resources
         curl_close($getSubscriptionCurl);
 
         $parsedResp = json_decode($resp);
 
+
+
+        if (!array_key_exists('data', $parsedResp)) {
+          echo "\n\n";
+          echo "Unexpected response from web-push-testing-service.............";
+          var_dump($resp);
+          echo "\n\n";
+          throw new Error('Unexpected response from web-push-testing-service.');
+        }
+
         $testId = $parsedResp->{'data'}->{'testId'};
         $subscription = $parsedResp->{'data'}->{'subscription'};
         $endpoint = $subscription->{'endpoint'};
@@ -201,6 +235,7 @@ public function testBrowsers($browserId, $browserVersion, $options)
                 throw $e;
             }
         }
+      };
     }
 
     protected function tearDown()