summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-12-09 23:56:39 +0000
committerGerrit Code Review <review@openstack.org>2016-12-09 23:56:39 +0000
commitd7993bab9dce0efc4a31ee3d31bda0aef5cf6b09 (patch)
tree2d2baedb907a26b6c703c4b3b8e17e6d3b2bfcab
parent7c8f0f48bfb941dc1147768493bbaf81bb437d58 (diff)
parentd77439bd9306a7e7f2da748a1a8fec757953ed3a (diff)
downloadoslo-db-d7993bab9dce0efc4a31ee3d31bda0aef5cf6b09.tar.gz
Merge "Replaces uuid.uuid4 with uuidutils.generate_uuid()"
-rw-r--r--oslo_db/tests/sqlalchemy/test_utils.py9
1 files changed, 4 insertions, 5 deletions
diff --git a/oslo_db/tests/sqlalchemy/test_utils.py b/oslo_db/tests/sqlalchemy/test_utils.py
index 67a211b..c88ac10 100644
--- a/oslo_db/tests/sqlalchemy/test_utils.py
+++ b/oslo_db/tests/sqlalchemy/test_utils.py
@@ -13,10 +13,9 @@
# License for the specific language governing permissions and limitations
# under the License.
-import uuid
-
import fixtures
import mock
+from oslo_utils import uuidutils
from oslotest import base as test_base
from oslotest import moxstubout
import six
@@ -757,7 +756,7 @@ class TestMigrationUtils(db_test_base.DbTestCase):
select_table_name = "__test_select_from_table__"
uuidstrs = []
for unused in range(10):
- uuidstrs.append(uuid.uuid4().hex)
+ uuidstrs.append(uuidutils.generate_uuid(dashed=False))
insert_table = Table(
insert_table_name, self.meta,
Column('id', Integer, primary_key=True,
@@ -797,7 +796,7 @@ class TestMigrationUtils(db_test_base.DbTestCase):
select_table_name = "__test_select_from_table__"
uuidstrs = []
for unused in range(10):
- uuidstrs.append(uuid.uuid4().hex)
+ uuidstrs.append(uuidutils.generate_uuid(dashed=False))
insert_table = Table(
insert_table_name, self.meta,
Column('id', Integer, primary_key=True,
@@ -837,7 +836,7 @@ class TestMigrationUtils(db_test_base.DbTestCase):
select_table_name = "__test_select_from_table__"
uuidstrs = []
for unused in range(10):
- uuidstrs.append(uuid.uuid4().hex)
+ uuidstrs.append(uuidutils.generate_uuid(dashed=False))
insert_table = Table(
insert_table_name, self.meta,
Column('id', Integer, primary_key=True,