summaryrefslogtreecommitdiff
path: root/nova/tests/network/test_manager.py
diff options
context:
space:
mode:
authorDavanum Srinivas <dims@linux.vnet.ibm.com>2014-10-24 14:18:30 -0400
committerDavanum Srinivas (dims) <davanum@gmail.com>2014-10-30 00:19:14 +0000
commit06e4919a452a6eef5f61beda3a107e11b47a90df (patch)
tree646cf5756dd80bdbaf35923df23db349bc465ed8 /nova/tests/network/test_manager.py
parentd34a46e38bc22cae3f6ae98dbd40389275e4c804 (diff)
downloadnova-06e4919a452a6eef5f61beda3a107e11b47a90df.tar.gz
Switch Nova to use oslo.concurrency
Let's switch to the newly released oslo library for the processutils and lockutils. We use the config fixture(s) to specify disable_process_locking and lock_path in the CONF variable of oslo.concurrency library for correctly setting the flags. The previous attempt at updating nova to use oslo.concurrency was reverted as it stopped running any tests. lockutils-wrapper should have been used in ini/shell scripts instead of lockutils.py module as the the module is no longer runnable (__main__ has been removed). In this review we use lockutils-wrapper correctly. The test harness has since been updated to bail out if 0 tests are run as well for additional insurance. Change-Id: I14c75ef2196fd08c9465d648e5cd53777bd9c7d1 Co-Authored-By: Nikola Dipanov <ndipanov@redhat.com> Co-Authored-By: Corey Wright <corey.wright@rackspace.com>
Diffstat (limited to 'nova/tests/network/test_manager.py')
-rw-r--r--nova/tests/network/test_manager.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/nova/tests/network/test_manager.py b/nova/tests/network/test_manager.py
index f58c86b895..c04b02906f 100644
--- a/nova/tests/network/test_manager.py
+++ b/nova/tests/network/test_manager.py
@@ -21,6 +21,7 @@ import fixtures
import mock
import mox
import netaddr
+from oslo.concurrency import processutils
from oslo.config import cfg
from oslo.db import exception as db_exc
from oslo import messaging
@@ -40,7 +41,6 @@ from nova import objects
from nova.objects import quotas as quotas_obj
from nova.objects import virtual_interface as vif_obj
from nova.openstack.common import log as logging
-from nova.openstack.common import processutils
from nova import quota
from nova import test
from nova.tests import fake_instance