Adds retries for Spanner tests, fixes a few test errors (GoogleCloudPlatform#931)

bshaffer · web-flow · commit 148d01a03b54 · 2019-07-10T14:56:24.000-06:00
diff --git a/bigtable/src/create_dev_instance.php b/bigtable/src/create_dev_instance.php
@@ -94,8 +94,7 @@
         );
         $operationResponse->pollUntilComplete();
         if (!$operationResponse->operationSucceeded()) {
-            $error = $operationResponse->getError();
-            throw $error;
+            print('Error: ' . $operationResponse->getError());
         } else {
             printf("Instance %s created.", $instance_id);
         }
diff --git a/bigtable/src/create_production_instance.php b/bigtable/src/create_production_instance.php
@@ -85,8 +85,7 @@
         );
         $operationResponse->pollUntilComplete();
         if (!$operationResponse->operationSucceeded()) {
-            $error = $operationResponse->getError();
-            throw $error;
+            print('Error: ' . $operationResponse->getError());
         } else {
             printf("Instance %s created.", $instance_id);
         }
diff --git a/spanner/test/spannerTest.php b/spanner/test/spannerTest.php
@@ -61,6 +61,11 @@ public static function setUpBeforeClass()
         self::$instance = $spanner->instance(self::$instanceId);
     }
 
+    public function setUp()
+    {
+        $this->useExpectationFailedBackoff();
+    }
+
     public function testCreateDatabase()
     {
         $output = $this->runCommand('create-database');

Original file line number	Diff line number	Diff line change
`@@ -61,6 +61,11 @@ public static function setUpBeforeClass()`
`61`	`61`	`self::$instance = $spanner->instance(self::$instanceId);`
`62`	`62`	`}`
`63`	`63`
	`64`	`+ public function setUp()`
	`65`	`+ {`
	`66`	`+ $this->useExpectationFailedBackoff();`
	`67`	`+ }`
	`68`	`+`
`64`	`69`	`public function testCreateDatabase()`
`65`	`70`	`{`
`66`	`71`	`$output = $this->runCommand('create-database');`