x/python-ganttclient
Code Issues Proposed changes

Merge "Remove gen_uuid()"

Browse Source
This commit is contained in:
Jenkins
2012-11-14 16:30:13 +00:00
committed by Gerrit Code Review
parent c2ccc71328 5211a5b0a3
commit 0d66ce7e19
3 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
nova/tests/hyperv/db_fakes.py
View File

@@ -19,6 +19,7 @@ Stubouts, mocks and fixtures for the test suite
""" """
import time import time
import uuid
from nova.compute import task_states from nova.compute import task_states
from nova.compute import vm_states from nova.compute import vm_states
@@ -29,7 +30,7 @@ from nova import utils
def get_fake_instance_data(name, project_id, user_id): def get_fake_instance_data(name, project_id, user_id):
return {'name': name, return {'name': name,
'id': 1, 'id': 1,
'uuid': utils.gen_uuid(), 'uuid': uuid.uuid4(),
'project_id': project_id, 'project_id': project_id,
'user_id': user_id, 'user_id': user_id,
'image_ref': "1", 'image_ref': "1",
@@ -124,7 +125,7 @@ def stub_out_db_instance_api(stubs):
base_options = { base_options = {
'name': values['name'], 'name': values['name'],
'id': values['id'], 'id': values['id'],
'uuid': utils.gen_uuid(), 'uuid': uuid.uuid4(),
'reservation_id': utils.generate_uid('r'), 'reservation_id': utils.generate_uid('r'),
'image_ref': values['image_ref'], 'image_ref': values['image_ref'],
'kernel_id': values['kernel_id'], 'kernel_id': values['kernel_id'],

7
nova/tests/test_db_api.py
View File

@@ -20,6 +20,7 @@
"""Unit tests for the DB API""" """Unit tests for the DB API"""
import datetime import datetime
import uuid as uuidutils
from nova import config from nova import config
from nova import context from nova import context
@@ -29,7 +30,7 @@ from nova import flags
from nova.openstack.common import timeutils from nova.openstack.common import timeutils
from nova import test from nova import test
from nova.tests import matchers from nova.tests import matchers
from nova import utils
CONF = config.CONF CONF = config.CONF
CONF.import_opt('reserved_host_memory_mb', 'nova.compute.resource_tracker') CONF.import_opt('reserved_host_memory_mb', 'nova.compute.resource_tracker')
@@ -145,7 +146,7 @@ class DbApiTestCase(test.TestCase):
self.assertRaises(exception.MarkerNotFound, self.assertRaises(exception.MarkerNotFound,
db.instance_get_all_by_filters, db.instance_get_all_by_filters,
self.context, {'display_name': '%test%'}, self.context, {'display_name': '%test%'},
marker=str(utils.gen_uuid())) marker=str(uuidutils.uuid4()))
def test_migration_get_unconfirmed_by_dest_compute(self): def test_migration_get_unconfirmed_by_dest_compute(self):
ctxt = context.get_admin_context() ctxt = context.get_admin_context()
@@ -286,7 +287,7 @@ class DbApiTestCase(test.TestCase):
def test_instance_fault_create(self): def test_instance_fault_create(self):
"""Ensure we can create an instance fault""" """Ensure we can create an instance fault"""
ctxt = context.get_admin_context() ctxt = context.get_admin_context()
uuid = str(utils.gen_uuid()) uuid = str(uuidutils.uuid4())
# Create a fault # Create a fault
fault_values = { fault_values = {

3
nova/tests/vmwareapi/db_fakes.py
View File

@@ -20,6 +20,7 @@ Stubouts, mocks and fixtures for the test suite
""" """
import time import time
import uuid
from nova.compute import task_states from nova.compute import task_states
from nova.compute import vm_states from nova.compute import vm_states
@@ -62,7 +63,7 @@ def stub_out_db_instance_api(stubs):
base_options = { base_options = {
'name': values['name'], 'name': values['name'],
'id': values['id'], 'id': values['id'],
'uuid': utils.gen_uuid(), 'uuid': uuid.uuid4(),
'reservation_id': utils.generate_uid('r'), 'reservation_id': utils.generate_uid('r'),
'image_ref': values['image_ref'], 'image_ref': values['image_ref'],
'kernel_id': values['kernel_id'], 'kernel_id': values['kernel_id'],