[2689] adjusted some tests to adapt to recent changes to config module.

mostly on the introduction of 'want_answer" and the rpc_call method.
should be essentially trivial, but still require some amount of change.
some tests still fail.

diff --git a/src/bin/stats/tests/b10-stats_test.py b/src/bin/stats/tests/b10-stats_test.py
index 56678d7d1cc0e68a1de216a71cfc59f620e296cc..773290252a6b978e771e95750a10505b4d7929a3 100644 (file)
--- a/src/bin/stats/tests/b10-stats_test.py
+++ b/src/bin/stats/tests/b10-stats_test.py
@@ -417,33 +417,24 @@ class TestStats(unittest.TestCase):
 
         """
 
-        def __check_group_sendmsg(command, destination):
-            self.assertEqual('ConfigManager', destination)
-            cmd, value = isc.config.ccsession.parse_command(command)
-            self.assertEqual(cmd,
+        def __check_rpc_call(command, group):
+            self.assertEqual('ConfigManager', group)
+            self.assertEqual(command,
                              isc.config.ccsession.COMMAND_GET_STATISTICS_SPEC)
-            self.assertEqual(None, value)
-            return 42           # faked seq number
-
-        def __check_group_recvmsg(nonblocking, seq):
-            self.assertFalse(nonblocking)
-            self.assertEqual(42, seq) # should be the one returned above
-            answer = isc.config.ccsession.create_answer(
-                0, {'Init': [{
-                            "item_name": "boot_time",
-                            "item_type": "string",
-                            "item_optional": False,
-                            # Use a different default so we can check it below
-                            "item_default": "2013-01-01T00:00:01Z",
-                            "item_title": "Boot time",
-                            "item_description": "dummy desc",
-                            "item_format": "date-time"
-                            }]})
-            return answer, None
+            answer_value = {'Init': [{
+                        "item_name": "boot_time",
+                        "item_type": "string",
+                        "item_optional": False,
+                        # Use a different default so we can check it below
+                        "item_default": "2013-01-01T00:00:01Z",
+                        "item_title": "Boot time",
+                        "item_description": "dummy desc",
+                        "item_format": "date-time"
+                        }]}
+            return answer_value
 
         self.stats = SimpleStats()
-        self.stats.cc_session.group_sendmsg = __check_group_sendmsg
-        self.stats.cc_session.group_recvmsg = __check_group_recvmsg
+        self.stats.cc_session.rpc_call = __check_rpc_call
 
         self.stats.update_modules()
 
@@ -475,10 +466,11 @@ class TestStats(unittest.TestCase):
                          "2013-01-01T00:00:01Z")
 
         # Error case
+        def __raise_on_rpc_call(x, y):
+            raise isc.config.RPCError(99, 'error')
         orig_parse_answer = stats.isc.config.ccsession.parse_answer
-        stats.isc.config.ccsession.parse_answer = lambda x: (99, 'error')
+        self.stats.cc_session.rpc_call = __raise_on_rpc_call
         self.assertRaises(stats.StatsError, self.stats.update_modules)
-        stats.isc.config.ccsession.parse_answer = orig_parse_answer
 
     def test_get_statistics_data(self):
         """Confirm the behavior of Stats.get_statistics_data().

diff --git a/src/bin/stats/tests/test_utils.py b/src/bin/stats/tests/test_utils.py
index 5794f7df5acaa0e1a2a3804faa5fbe138a442be0..f9a9a5d84ed8af2ae676121cd3306127e7aa82b0 100644 (file)
--- a/src/bin/stats/tests/test_utils.py
+++ b/src/bin/stats/tests/test_utils.py
@@ -524,6 +524,7 @@ class SimpleStats(stats.Stats):
         # Auth modules (hardcoded below).
         self.cc_session.group_sendmsg = self.__check_group_sendmsg
         self.cc_session.group_recvmsg = self.__check_group_recvmsg
+        self.cc_session.rpc_call = self.__rpc_call
         stats.Stats._init_statistics_data(self)
 
     def __init_auth_stat(self):
@@ -555,7 +556,7 @@ class SimpleStats(stats.Stats):
         # initialization until we are ready.
         pass
 
-    def __check_group_sendmsg(self, command, destination):
+    def __check_group_sendmsg(self, command, destination, want_answer=False):
         """Faked ModuleCCSession.group_sendmsg for tests.
 
         Skipping actual network communication, and just returning an internally
@@ -578,6 +579,10 @@ class SimpleStats(stats.Stats):
             return self.__default_answer, {'from': 'no-matter'}
         return self._answers.pop(0)
 
+    def __rpc_call(self, command, group):
+        answer, _ = self.__check_group_recvmsg(None, None)
+        return isc.config.ccsession.parse_answer(answer)[1]
+
 class MyStats(stats.Stats):
 
     stats._BASETIME = CONST_BASETIME