switch to regular flaky in compute (GoogleCloudPlatform#3326)

leahecole · web-flow · commit a031120a4ac4 · 2020-04-10T19:36:13.000Z
diff --git a/compute/api/create_instance_test.py b/compute/api/create_instance_test.py
@@ -12,14 +12,15 @@
 # limitations under the License.
 
 import os
-import re
+import uuid
 
-from gcp_devrel.testing.flaky import flaky
+from flaky import flaky
 
 from create_instance import main
 
 PROJECT = os.environ['GCLOUD_PROJECT']
 BUCKET = os.environ['CLOUD_STORAGE_BUCKET']
+INSTANCE_NAME = 'test-instance-' + str(uuid.uuid4())
 
 
 @flaky
@@ -28,14 +29,12 @@ def test_main(capsys):
         PROJECT,
         BUCKET,
         'us-central1-f',
-        'test-instance',
+        INSTANCE_NAME,
         wait=False)
 
     out, _ = capsys.readouterr()
 
-    expected_output = re.compile(
-        (r'Instances in project .* and zone us-central1-.* - test-instance'
-         r'.*Deleting instance.*done..$'),
-        re.DOTALL)
-
-    assert re.search(expected_output, out)
+    assert "Instances in project" in out
+    assert "zone us-central1-f" in out
+    assert INSTANCE_NAME in out
+    assert "Deleting instance" in out
diff --git a/compute/api/requirements-test.txt b/compute/api/requirements-test.txt
@@ -1,3 +1,2 @@
 pytest==5.3.2
-gcp-devrel-py-tools==0.0.15
 flaky==3.6.1
