x/python-ganttclient
Code Issues Proposed changes

Merge "Hide lock_prefix argument using synchronized_with_prefix()"

Browse Source
This commit is contained in:
Jenkins
2013-05-14 12:00:23 +00:00
committed by Gerrit Code Review
parent 49a0aa8a33 3c09821ba9
commit a8eb94a639
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
nova/tests/test_imagebackend.py
View File

@@ -161,7 +161,7 @@ class RawTestCase(_ImageTestCase, test.TestCase):
def prepare_mocks(self): def prepare_mocks(self):
fn = self.mox.CreateMockAnything() fn = self.mox.CreateMockAnything()
self.mox.StubOutWithMock(imagebackend.lockutils.synchronized, self.mox.StubOutWithMock(imagebackend.utils.synchronized,
'__call__') '__call__')
self.mox.StubOutWithMock(imagebackend.libvirt_utils, 'copy_image') self.mox.StubOutWithMock(imagebackend.libvirt_utils, 'copy_image')
self.mox.StubOutWithMock(imagebackend.disk, 'extend') self.mox.StubOutWithMock(imagebackend.disk, 'extend')
@@ -230,7 +230,7 @@ class Qcow2TestCase(_ImageTestCase, test.TestCase):
def prepare_mocks(self): def prepare_mocks(self):
fn = self.mox.CreateMockAnything() fn = self.mox.CreateMockAnything()
self.mox.StubOutWithMock(imagebackend.lockutils.synchronized, self.mox.StubOutWithMock(imagebackend.utils.synchronized,
'__call__') '__call__')
self.mox.StubOutWithMock(imagebackend.libvirt_utils, self.mox.StubOutWithMock(imagebackend.libvirt_utils,
'create_cow_image') 'create_cow_image')

4
nova/tests/test_migrations.py
View File

@@ -59,10 +59,10 @@ import sqlalchemy.exc
from nova.db.sqlalchemy import api as db from nova.db.sqlalchemy import api as db
import nova.db.sqlalchemy.migrate_repo import nova.db.sqlalchemy.migrate_repo
from nova.db.sqlalchemy import utils as db_utils 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 log as logging
from nova.openstack.common import timeutils from nova.openstack.common import timeutils
from nova import test from nova import test
from nova import utils
import nova.virt.baremetal.db.sqlalchemy.migrate_repo import nova.virt.baremetal.db.sqlalchemy.migrate_repo
@@ -246,7 +246,7 @@ class BaseMigrationTestCase(test.TestCase):
self.assertEqual(0, status, self.assertEqual(0, status,
"Failed to run: %s\n%s" % (cmd, output)) "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): def _reset_pg(self, conn_pieces):
(user, password, database, host) = \ (user, password, database, host) = \
get_pgsql_connection_info(conn_pieces) get_pgsql_connection_info(conn_pieces)