Plug systest instance leaks (googleapis#7004)

tseaver · web-flow · commit 82f7daa499a0 · 2018-12-19T17:39:49.000-05:00
Towards googleapis#7003.
diff --git a/bigtable/tests/system.py b/bigtable/tests/system.py
@@ -85,7 +85,7 @@ def _retry_on_unavailable(exc):
     return exc.code() == StatusCode.UNAVAILABLE
 
 
-retry_429 = RetryErrors(TooManyRequests)
+retry_429 = RetryErrors(TooManyRequests, max_tries=9)
 
 
 def setUpModule():
@@ -165,12 +165,13 @@ def test_create_instance_defaults(self):
             ALT_CLUSTER_ID, location_id=LOCATION_ID, serve_nodes=SERVE_NODES
         )
         operation = instance.create(clusters=[cluster])
-        # We want to make sure the operation completes.
-        operation.result(timeout=10)
 
         # Make sure this instance gets deleted after the test case.
         self.instances_to_delete.append(instance)
 
+        # We want to make sure the operation completes.
+        operation.result(timeout=10)
+
         # Create a new instance instance and make sure it is the same.
         instance_alt = Config.CLIENT.instance(ALT_INSTANCE_ID)
         instance_alt.reload()
@@ -194,12 +195,13 @@ def test_create_instance(self):
         ALT_CLUSTER_ID = ALT_INSTANCE_ID + "-cluster"
         cluster = instance.cluster(ALT_CLUSTER_ID, location_id=LOCATION_ID)
         operation = instance.create(clusters=[cluster])
-        # We want to make sure the operation completes.
-        operation.result(timeout=10)
 
         # Make sure this instance gets deleted after the test case.
         self.instances_to_delete.append(instance)
 
+        # We want to make sure the operation completes.
+        operation.result(timeout=10)
+
         # Create a new instance instance and make sure it is the same.
         instance_alt = Config.CLIENT.instance(ALT_INSTANCE_ID)
         instance_alt.reload()
@@ -252,12 +254,13 @@ def test_create_instance_w_two_clusters(self):
             default_storage_type=STORAGE_TYPE,
         )
         operation = instance.create(clusters=[cluster_1, cluster_2])
-        # We want to make sure the operation completes.
-        operation.result(timeout=10)
 
         # Make sure this instance gets deleted after the test case.
         self.instances_to_delete.append(instance)
 
+        # We want to make sure the operation completes.
+        operation.result(timeout=10)
+
         # Create a new instance instance and make sure it is the same.
         instance_alt = Config.CLIENT.instance(ALT_INSTANCE_ID)
         instance_alt.reload()
