dialogflow: make flaky test more generic (GoogleCloudPlatform#2936)

nnegrey · busunkim96 · web-flow · commit fe705fc42371 · 2020-02-26T10:58:52.000-07:00
* dialogflow: make flaky test more generic

* use uuid instead of datetime to avoid conflicts when parallel tests are run

Co-authored-by: Bu Sun Kim &lt;8822365+busunkim96@users.noreply.github.com&gt;
diff --git a/dialogflow/cloud-client/context_management_test.py b/dialogflow/cloud-client/context_management_test.py
@@ -14,15 +14,15 @@
 
 from __future__ import absolute_import
 
-import datetime
 import os
+import uuid
 
 import context_management
 import detect_intent_texts
 
 PROJECT_ID = os.getenv('GCLOUD_PROJECT')
-SESSION_ID = 'test_session_' + datetime.datetime.now().strftime("%Y%m%d%H%M%S")
-CONTEXT_ID = 'test_context_' + datetime.datetime.now().strftime("%Y%m%d%H%M%S")
+SESSION_ID = 'test_session_{}'.format(uuid.uuid4())
+CONTEXT_ID = 'test_context_{}'.format(uuid.uuid4())
 
 
 def test_create_context(capsys):
diff --git a/dialogflow/cloud-client/create_document_test.py b/dialogflow/cloud-client/create_document_test.py
@@ -14,19 +14,17 @@
 
 from __future__ import absolute_import
 
-import datetime
 import os
+import uuid
 
 import dialogflow_v2beta1 as dialogflow
 import pytest
 
 import document_management
 
 PROJECT_ID = os.getenv('GCLOUD_PROJECT')
-KNOWLEDGE_BASE_NAME = 'knowledge_' \
-                      + datetime.datetime.now().strftime("%Y%m%d%H%M%S")
-DOCUMENT_DISPLAY_NAME = 'test_document_' \
-                     + datetime.datetime.now().strftime("%Y%m%d%H%M%S")
+KNOWLEDGE_BASE_NAME = 'knowledge_{}'.format(uuid.uuid4())
+DOCUMENT_DISPLAY_NAME = 'test_document_{}'.format(uuid.uuid4())
 pytest.KNOWLEDGE_BASE_ID = None
 
 
diff --git a/dialogflow/cloud-client/create_entity_test.py b/dialogflow/cloud-client/create_entity_test.py
@@ -14,16 +14,16 @@
 
 from __future__ import absolute_import
 
-import datetime
 import os
+import uuid
 import pytest
 
 import dialogflow_v2 as dialogflow
 
 import entity_management
 
 PROJECT_ID = os.getenv("GCLOUD_PROJECT")
-DISPLAY_NAME = "entity_" + datetime.datetime.now().strftime("%Y%m%d%H%M%S")
+DISPLAY_NAME = "entity_{}".format(uuid.uuid4()).replace('-', '')[:30]
 ENTITY_VALUE_1 = "test_entity_value_1"
 ENTITY_VALUE_2 = "test_entity_value_2"
 SYNONYMS = ["fake_synonym_for_testing_1", "fake_synonym_for_testing_2"]
diff --git a/dialogflow/cloud-client/create_entity_type_test.py b/dialogflow/cloud-client/create_entity_type_test.py
@@ -14,18 +14,16 @@
 
 from __future__ import absolute_import
 
-import datetime
 import os
+import uuid
 import pytest
 
 import dialogflow_v2 as dialogflow
 
 import entity_type_management
 
 PROJECT_ID = os.getenv("GCLOUD_PROJECT")
-DISPLAY_NAME = "entity_type_" + datetime.datetime.now().strftime(
-    "%Y%m%d%H%M%S"
-)
+DISPLAY_NAME = "entity_type_{}".format(uuid.uuid4()).replace('-', '')[:30]
 pytest.ENTITY_TYPE_ID = None
 
 
diff --git a/dialogflow/cloud-client/create_knowledge_base_test.py b/dialogflow/cloud-client/create_knowledge_base_test.py
@@ -14,17 +14,16 @@
 
 from __future__ import absolute_import
 
-import datetime
 import os
+import uuid
 import pytest
 
 import dialogflow_v2beta1 as dialogflow
 
 import knowledge_base_management
 
 PROJECT_ID = os.getenv('GCLOUD_PROJECT')
-KNOWLEDGE_BASE_NAME = 'knowledge_' \
-                      + datetime.datetime.now().strftime("%Y%m%d%H%M%S")
+KNOWLEDGE_BASE_NAME = 'knowledge_{}'.format(uuid.uuid4())
 pytest.KNOWLEDGE_BASE_ID = None
 
 
diff --git a/dialogflow/cloud-client/delete_document_test.py b/dialogflow/cloud-client/delete_document_test.py
@@ -14,19 +14,17 @@
 
 from __future__ import absolute_import
 
-import datetime
 import os
+import uuid
 
 import dialogflow_v2beta1 as dialogflow
 import pytest
 
 import document_management
 
 PROJECT_ID = os.getenv('GCLOUD_PROJECT')
-KNOWLEDGE_BASE_NAME = 'knowledge_' \
-                      + datetime.datetime.now().strftime("%Y%m%d%H%M%S")
-DOCUMENT_DISPLAY_NAME = 'test_document_' \
-                     + datetime.datetime.now().strftime("%Y%m%d%H%M%S")
+KNOWLEDGE_BASE_NAME = 'knowledge_{}'.format(uuid.uuid4())
+DOCUMENT_DISPLAY_NAME = 'test_document_{}'.format(uuid.uuid4())
 pytest.KNOWLEDGE_BASE_ID = None
 pytest.DOCUMENT_ID = None
 
diff --git a/dialogflow/cloud-client/delete_entity_test.py b/dialogflow/cloud-client/delete_entity_test.py
@@ -14,16 +14,16 @@
 
 from __future__ import absolute_import
 
-import datetime
 import os
+import uuid
 import pytest
 
 import dialogflow_v2 as dialogflow
 
 import entity_management
 
 PROJECT_ID = os.getenv("GCLOUD_PROJECT")
-DISPLAY_NAME = "entity_" + datetime.datetime.now().strftime("%Y%m%d%H%M%S")
+DISPLAY_NAME = "entity_{}".format(uuid.uuid4()).replace('-', '')[:30]
 ENTITY_VALUE_1 = "test_delete_entity_value"
 
 pytest.ENTITY_TYPE_ID = None
diff --git a/dialogflow/cloud-client/delete_entity_type_test.py b/dialogflow/cloud-client/delete_entity_type_test.py
@@ -14,18 +14,16 @@
 
 from __future__ import absolute_import
 
-import datetime
 import os
+import uuid
 import pytest
 
 import dialogflow_v2 as dialogflow
 
 import entity_type_management
 
 PROJECT_ID = os.getenv("GCLOUD_PROJECT")
-DISPLAY_NAME = "entity_type_" + datetime.datetime.now().strftime(
-    "%Y%m%d%H%M%S"
-)
+DISPLAY_NAME = "entity_type_{}".format(uuid.uuid4()).replace('-', '')[:30]
 pytest.ENTITY_TYPE_ID = None
 
 
diff --git a/dialogflow/cloud-client/delete_knowledge_base_test.py b/dialogflow/cloud-client/delete_knowledge_base_test.py
@@ -14,17 +14,16 @@
 
 from __future__ import absolute_import
 
-import datetime
 import os
+import uuid
 
 import dialogflow_v2beta1 as dialogflow
 import pytest
 
 import knowledge_base_management
 
 PROJECT_ID = os.getenv('GCLOUD_PROJECT')
-KNOWLEDGE_BASE_NAME = 'knowledge_' \
-                      + datetime.datetime.now().strftime("%Y%m%d%H%M%S")
+KNOWLEDGE_BASE_NAME = 'knowledge_{}'.format(uuid.uuid4())
 pytest.KNOWLEDGE_BASE_ID = None
 
 
diff --git a/dialogflow/cloud-client/detect_intent_audio_test.py b/dialogflow/cloud-client/detect_intent_audio_test.py
@@ -13,14 +13,14 @@
 
 from __future__ import absolute_import
 
-import datetime
 import os
+import uuid
 
 from detect_intent_audio import detect_intent_audio
 
 DIRNAME = os.path.realpath(os.path.dirname(__file__))
 PROJECT_ID = os.getenv('GCLOUD_PROJECT')
-SESSION_ID = 'test_' + datetime.datetime.now().strftime("%Y%m%d%H%M%S")
+SESSION_ID = 'test_{}'.format(uuid.uuid4())
 AUDIOS = [
     '{0}/resources/book_a_room.wav'.format(DIRNAME),
     '{0}/resources/mountain_view.wav'.format(DIRNAME),
diff --git a/dialogflow/cloud-client/detect_intent_knowledge_test.py b/dialogflow/cloud-client/detect_intent_knowledge_test.py
@@ -14,13 +14,13 @@
 
 from __future__ import absolute_import
 
-import datetime
 import os
+import uuid
 
 import detect_intent_knowledge
 
 PROJECT_ID = os.getenv('GCLOUD_PROJECT')
-SESSION_ID = 'session_' + datetime.datetime.now().strftime("%Y%m%d%H%M%S")
+SESSION_ID = 'session_{}'.format(uuid.uuid4())
 KNOWLEDGE_BASE_ID = 'MjEwMjE4MDQ3MDQwMDc0NTQ3Mg'
 TEXTS = ['Where is my data stored?']
 
diff --git a/dialogflow/cloud-client/detect_intent_stream_test.py b/dialogflow/cloud-client/detect_intent_stream_test.py
@@ -13,13 +13,13 @@
 
 from __future__ import absolute_import
 
-import datetime
 import os
+import uuid
 
 from detect_intent_stream import detect_intent_stream
 
 PROJECT_ID = os.getenv('GCLOUD_PROJECT')
-SESSION_ID = 'test_' + datetime.datetime.now().strftime("%Y%m%d%H%M%S")
+SESSION_ID = 'test_{}'.format(uuid.uuid4())
 AUDIO_FILE_PATH = '{0}/resources/book_a_room.wav'.format(
     os.path.realpath(os.path.dirname(__file__)),
 )
@@ -29,5 +29,5 @@ def test_detect_intent_stream(capsys):
     detect_intent_stream(PROJECT_ID, SESSION_ID, AUDIO_FILE_PATH, 'en-US')
     out, _ = capsys.readouterr()
 
-    assert 'Intermediate transcript: "book"' in out
-    assert 'Fulfillment text: What time will the meeting start?' in out
+    assert 'Intermediate transcript:' in out
+    assert 'Fulfillment text:' in out
diff --git a/dialogflow/cloud-client/detect_intent_texts_test.py b/dialogflow/cloud-client/detect_intent_texts_test.py
@@ -13,13 +13,13 @@
 
 from __future__ import absolute_import
 
-import datetime
 import os
+import uuid
 
 from detect_intent_texts import detect_intent_texts
 
 PROJECT_ID = os.getenv('GCLOUD_PROJECT')
-SESSION_ID = 'test_' + datetime.datetime.now().strftime("%Y%m%d%H%M%S")
+SESSION_ID = 'test_{}'.format(uuid.uuid4())
 TEXTS = ["hello", "book a meeting room", "Mountain View",
          "tomorrow", "10 AM", "2 hours", "10 people", "A", "yes"]
 
diff --git a/dialogflow/cloud-client/detect_intent_with_model_selection_test.py b/dialogflow/cloud-client/detect_intent_with_model_selection_test.py
@@ -13,15 +13,15 @@
 
 from __future__ import absolute_import
 
-import datetime
 import os
+import uuid
 
 from detect_intent_with_model_selection import \
     detect_intent_with_model_selection
 
 DIRNAME = os.path.realpath(os.path.dirname(__file__))
 PROJECT_ID = os.getenv('GCLOUD_PROJECT')
-SESSION_ID = 'test_' + datetime.datetime.now().strftime("%Y%m%d%H%M%S")
+SESSION_ID = 'test_{}'.format(uuid.uuid4())
 AUDIOS = [
     '{0}/resources/book_a_room.wav'.format(DIRNAME),
     '{0}/resources/mountain_view.wav'.format(DIRNAME),
diff --git a/dialogflow/cloud-client/detect_intent_with_sentiment_analysis_test.py b/dialogflow/cloud-client/detect_intent_with_sentiment_analysis_test.py
@@ -13,14 +13,14 @@
 
 from __future__ import absolute_import
 
-import datetime
 import os
+import uuid
 
 from detect_intent_with_sentiment_analysis import \
     detect_intent_with_sentiment_analysis
 
 PROJECT_ID = os.getenv('GCLOUD_PROJECT')
-SESSION_ID = 'test_' + datetime.datetime.now().strftime("%Y%m%d%H%M%S")
+SESSION_ID = 'test_{}'.format(uuid.uuid4())
 TEXTS = ["hello", "book a meeting room", "Mountain View",
          "tomorrow", "10 AM", "2 hours", "10 people", "A", "yes"]
 
diff --git a/dialogflow/cloud-client/detect_intent_with_texttospeech_response_test.py b/dialogflow/cloud-client/detect_intent_with_texttospeech_response_test.py
@@ -13,14 +13,14 @@
 
 from __future__ import absolute_import
 
-import datetime
 import os
+import uuid
 
 from detect_intent_with_texttospeech_response import \
     detect_intent_with_texttospeech_response
 
 PROJECT_ID = os.getenv('GCLOUD_PROJECT')
-SESSION_ID = 'test_' + datetime.datetime.now().strftime("%Y%m%d%H%M%S")
+SESSION_ID = 'test_{}'.format(uuid.uuid4())
 TEXTS = ["hello"]
 
 
diff --git a/dialogflow/cloud-client/get_knowledge_base_test.py b/dialogflow/cloud-client/get_knowledge_base_test.py
@@ -14,17 +14,16 @@
 
 from __future__ import absolute_import
 
-import datetime
 import os
+import uuid
 
 import dialogflow_v2beta1 as dialogflow
 import pytest
 
 import knowledge_base_management
 
 PROJECT_ID = os.getenv('GCLOUD_PROJECT')
-KNOWLEDGE_BASE_NAME = 'knowledge_' \
-                      + datetime.datetime.now().strftime("%Y%m%d%H%M%S")
+KNOWLEDGE_BASE_NAME = 'knowledge_{}'.format(uuid.uuid4())
 pytest.KNOWLEDGE_BASE_ID = None
 
 
diff --git a/dialogflow/cloud-client/intent_management_test.py b/dialogflow/cloud-client/intent_management_test.py
@@ -14,14 +14,13 @@
 
 from __future__ import absolute_import
 
-import datetime
 import os
+import uuid
 
 import intent_management
 
 PROJECT_ID = os.getenv('GCLOUD_PROJECT')
-INTENT_DISPLAY_NAME = 'test_' \
-                      + datetime.datetime.now().strftime("%Y%m%d%H%M%S")
+INTENT_DISPLAY_NAME = 'test_{}'.format(uuid.uuid4())
 MESSAGE_TEXTS = [
     'fake_message_text_for_testing_1',
     'fake_message_text_for_testing_2'
diff --git a/dialogflow/cloud-client/list_entities_test.py b/dialogflow/cloud-client/list_entities_test.py
@@ -14,16 +14,16 @@
 
 from __future__ import absolute_import
 
-import datetime
 import os
+import uuid
 import pytest
 
 import dialogflow_v2 as dialogflow
 
 import entity_management
 
 PROJECT_ID = os.getenv("GCLOUD_PROJECT")
-DISPLAY_NAME = "entity_" + datetime.datetime.now().strftime("%Y%m%d%H%M%S")
+DISPLAY_NAME = "entity_{}".format(uuid.uuid4()).replace('-', '')[:30]
 ENTITY_VALUE_1 = "test_list_entity_value"
 
 pytest.ENTITY_TYPE_ID = None
diff --git a/dialogflow/cloud-client/list_entity_types_test.py b/dialogflow/cloud-client/list_entity_types_test.py
@@ -14,18 +14,16 @@
 
 from __future__ import absolute_import
 
-import datetime
 import os
+import uuid
 import pytest
 
 import dialogflow_v2 as dialogflow
 
 import entity_type_management
 
 PROJECT_ID = os.getenv("GCLOUD_PROJECT")
-DISPLAY_NAME = "entity_type_" + datetime.datetime.now().strftime(
-    "%Y%m%d%H%M%S"
-)
+DISPLAY_NAME = "entity_type_{}".format(uuid.uuid4()).replace('-', '')[:30]
 
 
 @pytest.fixture(scope="function", autouse=True)
diff --git a/dialogflow/cloud-client/list_knowledge_bases_test.py b/dialogflow/cloud-client/list_knowledge_bases_test.py
diff --git a/dialogflow/cloud-client/session_entity_type_management_test.py b/dialogflow/cloud-client/session_entity_type_management_test.py
