Address review comments. (Will be squashed.)

Author: dhermes

system_tests/bigtable.py

@@ -44,6 +44,26 @@ class Config(object):
     CLUSTER = None
 
 
+def _operation_wait(operation, max_attempts=5):
+    """Wait until an operation has completed.
+
+    :type operation: :class:`gcloud.bigtable.cluster.Operation`
+    :param operation: Operation that has not finished.
+
+    :type max_attempts: int
+    :param max_attempts: (Optional) The maximum number of times to check if
+                         the operation has finished. Defaults to 5.
+    """
+    total_sleep = 0
+    while not operation.finished():
+        if total_sleep > max_attempts:
+            return False
+        time.sleep(1)
+        total_sleep += 1
+
+    return True
+
+
 def setUpModule():
     Config.CLIENT = Client(admin=True)
     Config.CLUSTER = Config.CLIENT.cluster(CENTRAL_1C_ZONE, CLUSTER_ID,
@@ -58,12 +78,8 @@ def setUpModule():
 
     # After listing, create the test cluster.
     created_op = Config.CLUSTER.create()
-    total_sleep = 0
-    while not created_op.finished():
-        if total_sleep > 5:
-            raise RuntimeError('Cluster creation exceed 5 seconds.')
-        time.sleep(1)
-        total_sleep += 1
+    if not _operation_wait(created_op):
+        raise RuntimeError('Cluster creation exceed 5 seconds.')
 
 
 def tearDownModule():
@@ -95,7 +111,8 @@ def test_list_clusters(self):
             self.assertTrue(cluster_existence)
 
     def test_reload(self):
-        # Use same arguments as Config.CLUSTER (created in `setUpModule`).
+        # Use same arguments as Config.CLUSTER (created in `setUpModule`)
+        # so we can use reload() on a fresh instance.
         cluster = Config.CLIENT.cluster(CENTRAL_1C_ZONE, CLUSTER_ID)
         # Make sure metadata unset before reloading.
         cluster.display_name = None
@@ -113,8 +130,7 @@ def test_create_cluster(self):
         self.clusters_to_delete.append(cluster)
 
         # We want to make sure the operation completes.
-        time.sleep(2)
-        self.assertTrue(operation.finished())
+        self.assertTrue(_operation_wait(operation))
 
         # Create a new cluster instance and make sure it is the same.
         cluster_alt = Config.CLIENT.cluster(CENTRAL_1C_ZONE, cluster_id)