diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-11-15 22:53:27 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-11-15 22:53:27 +0000 |
| commit | 90dffc3a9c69aa5ffab23d2a28a8f669ef18be97 (patch) | |
| tree | 386a55ce646a4de43752536994848fa181d50a67 | |
| parent | ca3501267c4c6d60a69ad6a7b87ca62a0a80e8e5 (diff) | |
| parent | 3498d0da2711a9001f81468febb9f05e93ae8940 (diff) | |
| download | nova-90dffc3a9c69aa5ffab23d2a28a8f669ef18be97.tar.gz nova-90dffc3a9c69aa5ffab23d2a28a8f669ef18be97.tar.xz nova-90dffc3a9c69aa5ffab23d2a28a8f669ef18be97.zip | |
Merge "Do not alias stdlib uuid module as uuidutils, since nova has uuidutils."
| -rw-r--r-- | nova/tests/api/openstack/compute/test_consoles.py | 6 | ||||
| -rw-r--r-- | nova/tests/api/openstack/compute/test_versions.py | 4 | ||||
| -rw-r--r-- | nova/tests/test_db_api.py | 6 |
3 files changed, 8 insertions, 8 deletions
diff --git a/nova/tests/api/openstack/compute/test_consoles.py b/nova/tests/api/openstack/compute/test_consoles.py index 413015a4d..15920d2fb 100644 --- a/nova/tests/api/openstack/compute/test_consoles.py +++ b/nova/tests/api/openstack/compute/test_consoles.py @@ -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() diff --git a/nova/tests/api/openstack/compute/test_versions.py b/nova/tests/api/openstack/compute/test_versions.py index 2c05d6d8a..16790860c 100644 --- a/nova/tests/api/openstack/compute/test_versions.py +++ b/nova/tests/api/openstack/compute/test_versions.py @@ -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()) diff --git a/nova/tests/test_db_api.py b/nova/tests/test_db_api.py index 31d1b01b2..92eae023a 100644 --- a/nova/tests/test_db_api.py +++ b/nova/tests/test_db_api.py @@ -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 = { |