diff --git a/nova/tests/test_imagebackend.py b/nova/tests/test_imagebackend.py index 0f1d8532..b5d64a21 100644 --- a/nova/tests/test_imagebackend.py +++ b/nova/tests/test_imagebackend.py @@ -161,7 +161,7 @@ class RawTestCase(_ImageTestCase, test.TestCase): def prepare_mocks(self): fn = self.mox.CreateMockAnything() - self.mox.StubOutWithMock(imagebackend.lockutils.synchronized, + self.mox.StubOutWithMock(imagebackend.utils.synchronized, '__call__') self.mox.StubOutWithMock(imagebackend.libvirt_utils, 'copy_image') self.mox.StubOutWithMock(imagebackend.disk, 'extend') @@ -230,7 +230,7 @@ class Qcow2TestCase(_ImageTestCase, test.TestCase): def prepare_mocks(self): fn = self.mox.CreateMockAnything() - self.mox.StubOutWithMock(imagebackend.lockutils.synchronized, + self.mox.StubOutWithMock(imagebackend.utils.synchronized, '__call__') self.mox.StubOutWithMock(imagebackend.libvirt_utils, 'create_cow_image') diff --git a/nova/tests/test_migrations.py b/nova/tests/test_migrations.py index d4b38408..d7ef3da2 100644 --- a/nova/tests/test_migrations.py +++ b/nova/tests/test_migrations.py @@ -59,10 +59,10 @@ import sqlalchemy.exc from nova.db.sqlalchemy import api as db import nova.db.sqlalchemy.migrate_repo from nova.db.sqlalchemy import utils as db_utils -from nova.openstack.common import lockutils from nova.openstack.common import log as logging from nova.openstack.common import timeutils from nova import test +from nova import utils import nova.virt.baremetal.db.sqlalchemy.migrate_repo @@ -246,7 +246,7 @@ class BaseMigrationTestCase(test.TestCase): self.assertEqual(0, status, "Failed to run: %s\n%s" % (cmd, output)) - @lockutils.synchronized('pgadmin', 'nova-', external=True) + @utils.synchronized('pgadmin', external=True) def _reset_pg(self, conn_pieces): (user, password, database, host) = \ get_pgsql_connection_info(conn_pieces)