Merge "Replaces uuid.uuid4 with uuidutils.generate_uuid()"

This commit is contained in:
Jenkins 2016-12-09 23:56:39 +00:00 committed by Gerrit Code Review
commit d7993bab9d

View File

@ -13,10 +13,9 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
import uuid
import fixtures import fixtures
import mock import mock
from oslo_utils import uuidutils
from oslotest import base as test_base from oslotest import base as test_base
from oslotest import moxstubout from oslotest import moxstubout
import six import six
@ -757,7 +756,7 @@ class TestMigrationUtils(db_test_base.DbTestCase):
select_table_name = "__test_select_from_table__" select_table_name = "__test_select_from_table__"
uuidstrs = [] uuidstrs = []
for unused in range(10): for unused in range(10):
uuidstrs.append(uuid.uuid4().hex) uuidstrs.append(uuidutils.generate_uuid(dashed=False))
insert_table = Table( insert_table = Table(
insert_table_name, self.meta, insert_table_name, self.meta,
Column('id', Integer, primary_key=True, Column('id', Integer, primary_key=True,
@ -797,7 +796,7 @@ class TestMigrationUtils(db_test_base.DbTestCase):
select_table_name = "__test_select_from_table__" select_table_name = "__test_select_from_table__"
uuidstrs = [] uuidstrs = []
for unused in range(10): for unused in range(10):
uuidstrs.append(uuid.uuid4().hex) uuidstrs.append(uuidutils.generate_uuid(dashed=False))
insert_table = Table( insert_table = Table(
insert_table_name, self.meta, insert_table_name, self.meta,
Column('id', Integer, primary_key=True, Column('id', Integer, primary_key=True,
@ -837,7 +836,7 @@ class TestMigrationUtils(db_test_base.DbTestCase):
select_table_name = "__test_select_from_table__" select_table_name = "__test_select_from_table__"
uuidstrs = [] uuidstrs = []
for unused in range(10): for unused in range(10):
uuidstrs.append(uuid.uuid4().hex) uuidstrs.append(uuidutils.generate_uuid(dashed=False))
insert_table = Table( insert_table = Table(
insert_table_name, self.meta, insert_table_name, self.meta,
Column('id', Integer, primary_key=True, Column('id', Integer, primary_key=True,