refactor fixtures with inner functions

Author: leahecole

dataproc/snippets/submit_job_test.py

@@ -38,39 +38,39 @@
 
 @pytest.fixture(autouse=True)
 def setup_teardown():
+    cluster_client = dataproc.ClusterControllerClient(
+        client_options={
+            "api_endpoint": "{}-dataproc.googleapis.com:443".format(REGION)
+        }
+    )
+
     # Retry on InvalidArgument subnetwork not ready error
     @backoff.on_exception(backoff.expo, (InvalidArgument), max_tries=3)
-    def eventually_consistent_operation():
+    def setup():
+        # Create the cluster.
+        operation = cluster_client.create_cluster(
+            request={"project_id": PROJECT_ID, "region": REGION, "cluster": CLUSTER}
+        )
+        operation.result()
+
+    def teardown():
         try:
-            cluster_client = dataproc.ClusterControllerClient(
-                client_options={
-                    "api_endpoint": "{}-dataproc.googleapis.com:443".format(REGION)
+            operation = cluster_client.delete_cluster(
+                request={
+                    "project_id": PROJECT_ID,
+                    "region": REGION,
+                    "cluster_name": CLUSTER_NAME,
                 }
             )
-
-            # Create the cluster.
-            operation = cluster_client.create_cluster(
-                request={"project_id": PROJECT_ID, "region": REGION, "cluster": CLUSTER}
-            )
-            print("hi")
             operation.result()
-            print("yes")
-            yield
-
-        finally:
-            try:
-                operation = cluster_client.delete_cluster(
-                    request={
-                        "project_id": PROJECT_ID,
-                        "region": REGION,
-                        "cluster_name": CLUSTER_NAME,
-                    }
-                )
-                operation.result()
 
-            except NotFound:
-                print("Cluster already deleted")
-    eventually_consistent_operation()
+        except NotFound:
+            print("Cluster already deleted")
+    try:
+        setup()
+        yield
+    finally:
+        teardown()
 
 
 @backoff.on_exception(backoff.expo, (InternalServerError, ServiceUnavailable), max_tries=5)

dataproc/snippets/update_cluster_test.py

@@ -53,28 +53,30 @@ def cluster_client():
 def setup_teardown(cluster_client):
     # InvalidArgument is thrown when the subnetwork is not ready
     @backoff.on_exception(backoff.expo, (InvalidArgument), max_tries=3)
-    def eventually_consistent_operation():
+    def setup():
+        # Create the cluster.
+        operation = cluster_client.create_cluster(
+            request={"project_id": PROJECT_ID, "region": REGION, "cluster": CLUSTER}
+        )
+        operation.result()
+
+    def teardown():
         try:
-            # Create the cluster.
-            operation = cluster_client.create_cluster(
-                request={"project_id": PROJECT_ID, "region": REGION, "cluster": CLUSTER}
+            operation = cluster_client.delete_cluster(
+                request={
+                    "project_id": PROJECT_ID,
+                    "region": REGION,
+                    "cluster_name": CLUSTER_NAME,
+                }
             )
             operation.result()
-
-            yield
-        finally:
-            try:
-                operation = cluster_client.delete_cluster(
-                    request={
-                        "project_id": PROJECT_ID,
-                        "region": REGION,
-                        "cluster_name": CLUSTER_NAME,
-                    }
-                )
-                operation.result()
-            except NotFound:
-                print("Cluster already deleted")
-    eventually_consistent_operation()
+        except NotFound:
+            print("Cluster already deleted")
+    try:
+        setup()
+        yield
+    finally:
+        teardown()
 
 
 @backoff.on_exception(backoff.expo, (InternalServerError, ServiceUnavailable), max_tries=5)