From 536051d34be4c85ce2ba370944c223b7833da117 Mon Sep 17 00:00:00 2001 From: David Ripton Date: Thu, 15 Nov 2012 16:13:01 -0500 Subject: [PATCH] Do not alias stdlib uuid module as uuidutils, since nova has uuidutils. A few tests use "uuid" as a local variable name, and so must alias the Python stdlib uuid module to something else. Unfortunately they chose "uuidutils", but nova has a module called "uuidutils" so this is confusing. So change "uuidutils" to "stdlib_uuid" to reduce confusion. Change-Id: I0b8bad19e37220ef7b2fef1291a3308e481647fe --- nova/tests/test_db_api.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 = {