Add uuids to tests

dlp/inspect_content_test.py

@@ -13,6 +13,7 @@
 # limitations under the License.
 
 import os
+import uuid
 
 from gcp_devrel.testing import eventually_consistent
 from gcp_devrel.testing.flaky import flaky
@@ -26,16 +27,18 @@
 import pytest
 import inspect_content
 
+UNIQUE_STRING = str(uuid.uuid4()).split("-")[0]
 
 GCLOUD_PROJECT = os.getenv("GCLOUD_PROJECT")
-TEST_BUCKET_NAME = GCLOUD_PROJECT + "-dlp-python-client-test"
+TEST_BUCKET_NAME = GCLOUD_PROJECT + "-dlp-python-client-test" + UNIQUE_STRING
 RESOURCE_DIRECTORY = os.path.join(os.path.dirname(__file__), "resources")
 RESOURCE_FILE_NAMES = ["test.txt", "test.png", "harmless.txt", "accounts.txt"]
-TOPIC_ID = "dlp-test"
-SUBSCRIPTION_ID = "dlp-test-subscription"
+TOPIC_ID = "dlp-test" + UNIQUE_STRING
+SUBSCRIPTION_ID = "dlp-test-subscription" + UNIQUE_STRING
 DATASTORE_KIND = "DLP test kind"
-BIGQUERY_DATASET_ID = "dlp_test_dataset"
-BIGQUERY_TABLE_ID = "dlp_test_table"
+DATASTORE_NAME = "DLP test object" + UNIQUE_STRING
+BIGQUERY_DATASET_ID = "dlp_test_dataset" + UNIQUE_STRING
+BIGQUERY_TABLE_ID = "dlp_test_table" + UNIQUE_STRING
 
 
 @pytest.fixture(scope="module")
@@ -108,7 +111,7 @@ def datastore_project():
     datastore_client = google.cloud.datastore.Client()
 
     kind = DATASTORE_KIND
-    name = "DLP test object"
+    name = DATASTORE_NAME
     key = datastore_client.key(kind, name)
     item = google.cloud.datastore.Entity(key=key)
     item["payload"] = "My name is Gary Smith and my email is [email protected]"

dlp/risk_test.py

@@ -13,18 +13,21 @@
 # limitations under the License.
 
 from flaky import flaky
+import uuid
+
 import google.cloud.pubsub
 
 import pytest
 import os
 
 import risk
 
+UNIQUE_STRING = str(uuid.uuid4()).split("-")[0]
 GCLOUD_PROJECT = os.environ.get('GCLOUD_PROJECT')
 TABLE_PROJECT = os.environ.get('GCLOUD_PROJECT')
-TOPIC_ID = "dlp-test"
-SUBSCRIPTION_ID = "dlp-test-subscription"
-DATASET_ID = "dlp_test_dataset"
+TOPIC_ID = "dlp-test" + UNIQUE_STRING
+SUBSCRIPTION_ID = "dlp-test-subscription" + UNIQUE_STRING
+DATASET_ID = "integration_tests_dlp" + UNIQUE_STRING
 UNIQUE_FIELD = "Name"
 REPEATED_FIELD = "Mystery"
 NUMERIC_FIELD = "Age"

dlp/templates_test.py

@@ -13,15 +13,16 @@
 # limitations under the License.
 
 import os
+import uuid
 
 import google.api_core.exceptions
 import google.cloud.storage
 
 import templates
 
-
+UNIQUE_STRING = str(uuid.uuid4()).split("-")[0]
 GCLOUD_PROJECT = os.getenv("GCLOUD_PROJECT")
-TEST_TEMPLATE_ID = "test-template"
+TEST_TEMPLATE_ID = "test-template"+UNIQUE_STRING
 
 
 def test_create_list_and_delete_template(capsys):

dlp/triggers_test.py

@@ -13,6 +13,7 @@
 # limitations under the License.
 
 import os
+import uuid
 
 import google.api_core.exceptions
 import google.cloud.storage
@@ -21,12 +22,12 @@
 
 import triggers
 
-
+UNIQUE_STRING = str(uuid.uuid4()).split("-")[0]
 GCLOUD_PROJECT = os.getenv("GCLOUD_PROJECT")
-TEST_BUCKET_NAME = GCLOUD_PROJECT + "-dlp-python-client-test"
+TEST_BUCKET_NAME = GCLOUD_PROJECT + "-dlp-python-client-test" + UNIQUE_STRING
 RESOURCE_DIRECTORY = os.path.join(os.path.dirname(__file__), "resources")
 RESOURCE_FILE_NAMES = ["test.txt", "test.png", "harmless.txt", "accounts.txt"]
-TEST_TRIGGER_ID = "test-trigger"
+TEST_TRIGGER_ID = "test-trigger" + UNIQUE_STRING
 
 
 @pytest.fixture(scope="module")