bring back commits lost in merge

1 files changed, 19 insertions, 0 deletions

diff --git a/nova/tests/test_rpc.py b/nova/tests/test_rpc.py
index f64209596..e5d99474d 100644
--- a/nova/tests/test_rpc.py
+++ b/nova/tests/test_rpc.py
@@ -61,6 +61,18 @@ class RpcTestCase(test.TestCase):
             self.assertEqual(value + i, x)
             i += 1
 
+    def test_multicall_succeed_three_times_yield(self):
+        """Get a value through rpc call"""
+        value = 42
+        result = rpc.multicall(self.context,
+                              'test',
+                              {"method": "echo_three_times_yield",
+                               "args": {"value": value}})
+        i = 0
+        for x in result:
+            self.assertEqual(value + i, x)
+            i += 1
+
     def test_context_passed(self):
         """Makes sure a context is passed through rpc call"""
         value = 42
@@ -83,6 +95,7 @@ class RpcTestCase(test.TestCase):
                           'test',
                           {"method": "fail",
                            "args": {"value": value}})
+        LOG.error('INNNNNNN BETTTWWWWWWWWWWEEEEEEEEEEN')
         try:
             rpc.call(self.context,
                      'test',
@@ -187,6 +200,12 @@ class TestReceiver(object):
         context.reply(value + 2)
 
     @staticmethod
+    def echo_three_times_yield(context, value):
+        yield value
+        yield value + 1
+        yield value + 2
+
+    @staticmethod
     def fail(context, value):
         """Raises an exception with the value sent in"""
         raise Exception(value)