From dcbc137baca4ad3ded4b618d04c5b3472e58bc4a Mon Sep 17 00:00:00 2001 From: Craig Vyvial Date: Wed, 2 Sep 2015 20:48:26 -0500 Subject: [PATCH] Test instance name can not have special charactrers in it now. Change-Id: Ie43bc969425795b5ba9e9ee988e0caa8e86ce354 Depends-On: I5c5a7e94ba0973077647cf253c9269b4b2ba31bf --- trove/tests/api/configurations.py | 3 ++- trove/tests/api/instances.py | 6 +++--- trove/tests/api/instances_mysql_down.py | 4 ++-- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/trove/tests/api/configurations.py b/trove/tests/api/configurations.py index 1133723c43..79835cad8a 100644 --- a/trove/tests/api/configurations.py +++ b/trove/tests/api/configurations.py @@ -17,6 +17,7 @@ from datetime import datetime import json from time import sleep +import uuid from proboscis import after_class from proboscis.asserts import assert_equal @@ -580,7 +581,7 @@ class StartInstanceWithConfiguration(ConfigurationsTestBase): users.append({"name": "liteconf", "password": "liteconfpass", "databases": [{"name": "firstdbconfig"}]}) configuration_instance.users = users - configuration_instance.name = "TEST_" + str(datetime.now()) + "_config" + configuration_instance.name = "TEST_" + str(uuid.uuid4()) + "_config" flavor_href = instance_info.dbaas_flavor_href configuration_instance.dbaas_flavor_href = flavor_href configuration_instance.volume = instance_info.volume diff --git a/trove/tests/api/instances.py b/trove/tests/api/instances.py index d33132d772..f4adb02496 100644 --- a/trove/tests/api/instances.py +++ b/trove/tests/api/instances.py @@ -13,12 +13,12 @@ # License for the specific language governing permissions and limitations # under the License. -from datetime import datetime import os import re import time from time import sleep import unittest +import uuid from proboscis import after_class @@ -215,7 +215,7 @@ class InstanceSetup(object): def create_instance_name(self): id = existing_instance() if id is None: - instance_info.name = "TEST_" + str(datetime.now()) + instance_info.name = "TEST_" + str(uuid.uuid4()) else: instance_info.name = dbaas.instances.get(id).name @@ -772,7 +772,7 @@ class CreateInstanceWithNeutron(unittest.TestCase): self.result = None self.instance_name = ("TEST_INSTANCE_CREATION_WITH_NICS" - + str(datetime.now())) + + str(uuid.uuid4())) databases = [] self.default_cidr = CONFIG.values.get('shared_network_subnet', None) if VOLUME_SUPPORT: diff --git a/trove/tests/api/instances_mysql_down.py b/trove/tests/api/instances_mysql_down.py index e108052ae8..e61337f264 100644 --- a/trove/tests/api/instances_mysql_down.py +++ b/trove/tests/api/instances_mysql_down.py @@ -16,8 +16,8 @@ Extra tests to create an instance, shut down MySQL, and delete it. """ -from datetime import datetime import time +import uuid from proboscis import asserts from proboscis import before_class @@ -53,7 +53,7 @@ class TestBase(object): 'instance_bigger_flavor_name', 'm1.small') flavors = self.client.find_flavors_by_name(flavor_name) self.flavor_id = flavors[0].id - self.name = "TEST_" + str(datetime.now()) + self.name = "TEST_" + str(uuid.uuid4()) # Get the resize to flavor. flavors2 = self.client.find_flavors_by_name(flavor2_name) self.new_flavor_id = flavors2[0].id