refactor(spanner): DRY up extended polling loop in BackupTest

Author: cy-yun

Spanner/tests/System/BackupTest.php

@@ -154,19 +154,7 @@ public function testCreateBackup()
         $this->assertArrayHasKey('startTime', $metadata['progress']);
 
         // Poll for completion with the extended timeout
-        $timeout = time() + self::LONG_TIMEOUT_SECONDS;
-        while (time() < $timeout) {
-            try {
-                $op->pollUntilComplete([
-                    'timeoutMillis' => ($timeout - time()) * 1000
-                ]);
-                break;
-            } catch (\Google\ApiCore\ApiException $e) {
-                if ($e->getStatus() !== 'DEADLINE_EXCEEDED') {
-                    throw $e;
-                }
-            }
-        }
+        $this->pollWithExtendedTimeout($op);
 
         self::$deletionQueue->add(function () use ($backup) {
             $backup->delete();
@@ -292,19 +280,7 @@ public function testCreateBackup2()
         $backup = self::$instance->backup(self::$backupId2);
 
         $op = $backup->create(self::$dbName2, $expireTime);
-        $timeout = time() + self::LONG_TIMEOUT_SECONDS;
-        while (time() < $timeout) {
-            try {
-                $op->pollUntilComplete([
-                    'maxPollingDurationSeconds' => $timeout - time()
-                ]);
-                break;
-            } catch (\Google\ApiCore\ApiException $e) {
-                if ($e->getStatus() !== 'DEADLINE_EXCEEDED') {
-                    throw $e;
-                }
-            }
-        }
+        $this->pollWithExtendedTimeout($op);
 
         self::$deletionQueue->add(function () use ($backup) {
             $backup->delete();
@@ -336,19 +312,7 @@ public function testCreateBackupCopy()
         $this->assertArrayHasKey('progressPercent', $metadata['progress']);
         $this->assertArrayHasKey('startTime', $metadata['progress']);
 
-        $timeout = time() + self::LONG_TIMEOUT_SECONDS;
-        while (time() < $timeout) {
-            try {
-                $op->pollUntilComplete([
-                    'maxPollingDurationSeconds' => $timeout - time()
-                ]);
-                break;
-            } catch (\Google\ApiCore\ApiException $e) {
-                if ($e->getStatus() !== 'DEADLINE_EXCEEDED') {
-                    throw $e;
-                }
-            }
-        }
+        $this->pollWithExtendedTimeout($op);
 
         self::$deletionQueue->add(function () use ($newBackup) {
             $newBackup->delete();
@@ -645,19 +609,7 @@ public function testRestoreToNewDatabase()
         $this->assertArrayHasKey('startTime', $metadata['progress']);
 
         // Poll for completion with the extended timeout
-        $timeout = time() + self::LONG_TIMEOUT_SECONDS;
-        while (time() < $timeout) {
-            try {
-                $op->pollUntilComplete([
-                    'maxPollingDurationSeconds' => $timeout - time()
-                ]);
-                break;
-            } catch (\Google\ApiCore\ApiException $e) {
-                if ($e->getStatus() !== 'DEADLINE_EXCEEDED') {
-                    throw $e;
-                }
-            }
-        }
+        $this->pollWithExtendedTimeout($op);
         $restoredDb = $this::$instance->database($restoreDbName);
 
         self::$deletionQueue->add(function () use ($restoredDb) {
@@ -763,4 +715,22 @@ private static function parseName($name, $id)
     {
         return DatabaseAdminClient::parseName($name)[$id];
     }
+    private function pollWithExtendedTimeout($op)
+    {
+        $timeout = time() + self::LONG_TIMEOUT_SECONDS;
+        while (time() < $timeout) {
+            try {
+                $op->pollUntilComplete([
+                    'maxPollingDurationSeconds' => $timeout - time()
+                ]);
+                break;
+            } catch (\Google\ApiCore\ApiException $e) {
+                if ($e->getStatus() !== 'DEADLINE_EXCEEDED') {
+                    throw $e;
+                }
+            }
+        }
+        
+        return $op;
+    }
 }