Merge "Don't store connection pool in RpcContext."

1 files changed, 0 insertions, 23 deletions

diff --git a/nova/tests/rpc/common.py b/nova/tests/rpc/common.py
index 895ea4618..f9727082d 100644
--- a/nova/tests/rpc/common.py
+++ b/nova/tests/rpc/common.py
@@ -52,13 +52,6 @@ class _BaseRpcTestCase(test.TestCase):
                                                  "args": {"value": value}})
         self.assertEqual(value, result)
 
-    def test_call_succeed_despite_multiple_returns(self):
-        value = 42
-        result = self.rpc.call(self.context, 'test',
-                {"method": "echo_three_times",
-                 "args": {"value": value}})
-        self.assertEqual(value + 2, result)
-
     def test_call_succeed_despite_multiple_returns_yield(self):
         value = 42
         result = self.rpc.call(self.context, 'test',
@@ -77,15 +70,6 @@ class _BaseRpcTestCase(test.TestCase):
                 self.fail('should only receive one response')
             self.assertEqual(value + i, x)
 
-    def test_multicall_succeed_three_times(self):
-        value = 42
-        result = self.rpc.multicall(self.context,
-                              'test',
-                              {"method": "echo_three_times",
-                               "args": {"value": value}})
-        for i, x in enumerate(result):
-            self.assertEqual(value + i, x)
-
     def test_multicall_three_nones(self):
         value = 42
         result = self.rpc.multicall(self.context,
@@ -210,13 +194,6 @@ class TestReceiver(object):
         return context.to_dict()
 
     @staticmethod
-    def echo_three_times(context, value):
-        context.reply(value)
-        context.reply(value + 1)
-        context.reply(value + 2)
-        context.reply(ending=True)
-
-    @staticmethod
     def multicall_three_nones(context, value):
         yield None
         yield None