openstack
/
nova
Code Issues Proposed changes

Merge "Do not alias stdlib uuid module as uuidutils, since nova has uuidutils."

This commit is contained in:
Jenkins 2012-11-15 22:53:27 +00:00 committed by Gerrit Code Review
parent ca3501267c 3498d0da27
commit 90dffc3a9c
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nova/tests/api/openstack/compute/test_consoles.py
View File

@ -17,7 +17,7 @@
# under the License.
import datetime
import uuid as uuidutils
import uuid as stdlib_uuid
from lxml import etree
import webob
@ -58,7 +58,7 @@ class FakeInstanceDB(object):
if id is None:
id = self.max_id + 1
if uuid is None:
uuid = str(uuidutils.uuid4())
uuid = str(stdlib_uuid.uuid4())
instance = stub_instance(id, uuid=uuid)
self.instances_by_id[id] = instance
self.ids_by_uuid[uuid] = id
@ -134,7 +134,7 @@ class ConsolesControllerTest(test.TestCase):
self.instance_db.return_server_by_id)
self.stubs.Set(db, 'instance_get_by_uuid',
self.instance_db.return_server_by_uuid)
self.uuid = str(uuidutils.uuid4())
self.uuid = str(stdlib_uuid.uuid4())
self.url = '/v2/fake/servers/%s/consoles' % self.uuid
self.controller = consoles.Controller()

4
nova/tests/api/openstack/compute/test_versions.py
View File

@ -15,7 +15,7 @@
# License for the specific language governing permissions and limitations
# under the License.
import uuid as uuidutils
import uuid as stdlib_uuid
import feedparser
from lxml import etree
@ -386,7 +386,7 @@ class VersionsTest(test.TestCase):
self.assertEqual(res.content_type, "application/json")
def test_multi_choice_server(self):
uuid = str(uuidutils.uuid4())
uuid = str(stdlib_uuid.uuid4())
req = webob.Request.blank('/servers/' + uuid)
req.accept = "application/json"
res = req.get_response(fakes.wsgi_app())

6
nova/tests/test_db_api.py
View File

@ -20,7 +20,7 @@
"""Unit tests for the DB API"""
import datetime
import uuid as uuidutils
import uuid as stdlib_uuid
from nova import config
from nova import context
@ -146,7 +146,7 @@ class DbApiTestCase(test.TestCase):
self.assertRaises(exception.MarkerNotFound,
db.instance_get_all_by_filters,
self.context, {'display_name': '%test%'},
marker=str(uuidutils.uuid4()))
marker=str(stdlib_uuid.uuid4()))
def test_migration_get_unconfirmed_by_dest_compute(self):
ctxt = context.get_admin_context()
@ -307,7 +307,7 @@ class DbApiTestCase(test.TestCase):
def test_instance_fault_create(self):
"""Ensure we can create an instance fault"""
ctxt = context.get_admin_context()
uuid = str(uuidutils.uuid4())
uuid = str(stdlib_uuid.uuid4())
# Create a fault
fault_values = {