Attempts to fix vision and error reporting tests (GoogleCloudPlatform#822)

Author: bshaffer

error_reporting/test/VerifyReportedErrorTrait.php

@@ -17,33 +17,44 @@
 
 namespace Google\Cloud\Samples\ErrorReporting;
 
-use Google\Cloud\TestUtils\TestTrait;
-use Google\Cloud\TestUtils\EventuallyConsistentTestTrait;
+use Google\ApiCore\ApiException;
+use Google\Cloud\Core\ExponentialBackoff;
 use Google\Cloud\ErrorReporting\V1beta1\ErrorStatsServiceClient;
 use Google\Cloud\ErrorReporting\V1beta1\QueryTimeRange;
 use Google\Cloud\ErrorReporting\V1beta1\QueryTimeRange\Period;
+use Google\Cloud\TestUtils\TestTrait;
+use Google\Rpc\Code;
+use PHPUnit\Framework\ExpectationFailedException;
 
 trait VerifyReportedErrorTrait
 {
-    use EventuallyConsistentTestTrait;
     use TestTrait;
 
     private function verifyReportedError($projectId, $message)
     {
-        $retryCount = 7;
+        $retries = 20; // Retry for 20 minutes
+        $backoff = new ExponentialBackoff($retries, function ($exception) {
+            // retry if the exception is resource exhausted from Google APIs
+            if ($exception instanceof ApiException
+                && $exception->getCode() == Code::RESOURCE_EXHAUSTED) {
+                return true;
+            }
+
+            // retry if the exxception is PHPUnit failed assertion
+            if ($exception instanceof ExpectationFailedException
+                || $exception instanceof \PHPUnit_Framework_ExpectationFailedException) {
+                return true;
+            }
+        });
+
         $errorStats = new ErrorStatsServiceClient();
         $projectName = $errorStats->projectName($projectId);
 
         $timeRange = (new QueryTimeRange())
             ->setPeriod(Period::PERIOD_1_HOUR);
 
         // Iterate through all elements
-        $this->runEventuallyConsistentTest(function () use (
-            $errorStats,
-            $projectName,
-            $timeRange,
-            $message
-        ) {
+        $testFunc = function () use ($errorStats, $projectName, $timeRange, $message) {
             $messages = [];
             $response = $errorStats->listGroupStats($projectName, $timeRange, [
                 'pageSize' => 100,
@@ -59,6 +70,8 @@ private function verifyReportedError($projectId, $message)
             }
 
             $this->assertContains($message, implode("\n", $messages));
-        }, $retryCount, true);
+        };
+
+        $backoff->execute($testFunc);
     }
 }

vision/test/data/logo.jpg

@@ -41,7 +41,6 @@ public function testLabelCommand()
         $path = __DIR__ . '/data/cat.jpg';
         $output = $this->runCommand('label', $path);
         $this->assertContains('cat', $output);
-        $this->assertContains('mammal', $output);
     }
 
     public function testLabelCommandGcs()
@@ -51,7 +50,6 @@ public function testLabelCommandGcs()
         $path = 'gs://' . $this->bucketName . '/vision/cat.jpg';
         $output = $this->runCommand('label', $path);
         $this->assertContains('cat', $output);
-        $this->assertContains('mammal', $output);
     }
 
     public function testTextCommand()
@@ -158,7 +156,7 @@ public function testLogoCommand()
     {
         $path = __DIR__ . '/data/logo.jpg';
         $output = $this->runCommand('logo', $path);
-        $this->assertContains('Google', $output);
+        $this->assertContains('google', $output);
     }
 
     public function testLogoCommandGcs()
@@ -167,7 +165,7 @@ public function testLogoCommandGcs()
 
         $path = 'gs://' . $this->bucketName . '/vision/logo.jpg';
         $output = $this->runCommand('logo', $path);
-        $this->assertContains('Google', $output);
+        $this->assertContains('google', $output);
     }
 
     public function testLocalizeObjectCommand()