LoggingCQLClient.disconnect implemented

silverberg/logger.py

@@ -51,3 +51,9 @@ def record_time(result):
             return result
 
         return self._client.execute(query, args, consistency).addBoth(record_time)
+
+    def disconnect(self):
+        """
+        See :py:func:`silverberg.client.CQLClient.disconnect`
+        """
+        return self._client.disconnect()

silverberg/test/test_logger.py

@@ -31,7 +31,7 @@ def setUp(self):
         """
         Mock CQLClient and log instance
         """
-        self.client = mock.Mock(spec=['execute'])
+        self.client = mock.Mock(spec=['execute', 'disconnect'])
         self.log = mock.Mock(spec=['msg'])
         self.clock = Clock()
         self.logclient = LoggingCQLClient(self.client, self.log, self.clock)
@@ -71,3 +71,12 @@ def _execute(*args):
                                              seconds_taken=10)
         _, kwargs = self.log.msg.call_args
         self.assertEqual(kwargs['reason'].value, err)
+
+    def test_disconnect(self):
+        """
+        logclient.disconnect() calls internal client's disconnect()
+        """
+        self.client.disconnect.return_value = 'result'
+        d = self.logclient.disconnect()
+        self.client.disconnect.assert_called_once_with()
+        self.assertEquals(d, 'result')