linting and global vars

vuppalli · vuppalli · commit 81265d29c7b7 · 2020-06-09T16:01:52.000-04:00
diff --git a/data-science-onramp/data-ingestion/setup_test.py b/data-science-onramp/data-ingestion/setup_test.py
@@ -31,49 +31,47 @@
         ],
     },
 }
-
-
-@pytest.fixture(autouse=True)
-def setup_and_teardown_cluster():
-    # Create cluster configuration
-    cluster_data = {
-        'project_id': PROJECT,
-        'cluster_name': CLUSTER_NAME,
-        'config': {
-            'gce_cluster_config': {
-                'zone_uri': '',
-                "metadata": {
-                    "PIP_PACKAGES": "google-cloud-storage"
-                },
+CLUSTER_DATA = {  # Create cluster configuration
+    'project_id': PROJECT,
+    'cluster_name': CLUSTER_NAME,
+    'config': {
+        'gce_cluster_config': {
+            'zone_uri': '',
+            "metadata": {
+                "PIP_PACKAGES": "google-cloud-storage"
             },
-            'master_config': {
-                'num_instances': 1,
-                'machine_type_uri': 'n1-standard-8'
-            },
-            'worker_config': {
-                'num_instances': 6,
-                'machine_type_uri': 'n1-standard-8'
-            },
-            "initialization_actions": [
-                {
-                    "executable_file": ("gs://dataproc-initialization-actions/"
-                                        "python/pip-install.sh"),
-                }
-            ],
-            "software_config": {
-                "image_version": "1.5.4-debian10",
-                "optional_components": [
-                    "ANACONDA"
-                ],
+        },
+        'master_config': {
+            'num_instances': 1,
+            'machine_type_uri': 'n1-standard-8'
+        },
+        'worker_config': {
+            'num_instances': 6,
+            'machine_type_uri': 'n1-standard-8'
+        },
+        "initialization_actions": [
+            {
+                "executable_file": ("gs://dataproc-initialization-actions/"
+                                    "python/pip-install.sh"),
             }
+        ],
+        "software_config": {
+            "image_version": "1.5.4-debian10",
+            "optional_components": [
+                "ANACONDA"
+            ],
         }
     }
+}
 
+
+@pytest.fixture(autouse=True)
+def setup_and_teardown_cluster():
     # Create cluster using cluster client
     cluster_client = dataproc.ClusterControllerClient(client_options={
         'api_endpoint': f'{REGION}-dataproc.googleapis.com:443'
     })
-    operation = cluster_client.create_cluster(PROJECT, REGION, cluster_data)
+    operation = cluster_client.create_cluster(PROJECT, REGION, CLUSTER_DATA)
 
     # Wait for cluster to provision
     operation.result()
@@ -111,7 +109,7 @@ def get_blob_from_path(path):
 
 
 def is_in_table(value, out):
-    return re.search(f"\| *{value}\|", out)
+    return re.search(f"\\| *{value}\\|", out)
 
 
 def test_setup():
