Merge "Emit a warning if RPC calls made with lock."

1 files changed, 13 insertions, 0 deletions

diff --git a/tests/unit/rpc/test_proxy.py b/tests/unit/rpc/test_proxy.py
index 64eb008..436bcab 100644
--- a/tests/unit/rpc/test_proxy.py
+++ b/tests/unit/rpc/test_proxy.py
@@ -21,6 +21,7 @@ Unit Tests for rpc.proxy
 import copy
 
 from openstack.common import context
+from openstack.common import lockutils
 from openstack.common.fixture import moxstubout
 from openstack.common import rpc
 from openstack.common.rpc import proxy
@@ -45,6 +46,7 @@ class RpcProxyTestCase(utils.BaseTestCase):
         self.fake_kwargs = None
 
         def _fake_rpc_method(*args, **kwargs):
+            rpc._check_for_lock()
             self.fake_args = args
             self.fake_kwargs = kwargs
             if has_retval:
@@ -101,6 +103,17 @@ class RpcProxyTestCase(utils.BaseTestCase):
     def test_multicall(self):
         self._test_rpc_method('multicall', has_timeout=True, has_retval=True)
 
+    def test_multicall_with_lock_held(self):
+        self.config(debug=True)
+        self.assertFalse(rpc._check_for_lock())
+
+        @lockutils.synchronized('detecting', 'test-')
+        def f():
+            self.assertTrue(rpc._check_for_lock())
+        f()
+
+        self.assertFalse(rpc._check_for_lock())
+
     def test_cast(self):
         self._test_rpc_method('cast')