ensure that client 'if not self.sock: self._connect()' behavior is te…

…sted

pymemcache/client/base.py

@@ -788,12 +788,11 @@ def _store_cmd(self, name, values, expire, noreply, cas=None):
                 extra += b' noreply'
 
             cmds.append(name + b' ' + key + b' ' +
-                   six.text_type(flags).encode('ascii') +
-                   b' ' + six.text_type(expire).encode('ascii') +
-                   b' ' + six.text_type(len(data)).encode('ascii') + extra +
-                   b'\r\n' + data + b'\r\n')
+                        six.text_type(flags).encode('ascii') +
+                        b' ' + six.text_type(expire).encode('ascii') +
+                        b' ' + six.text_type(len(data)).encode('ascii') +
+                        extra + b'\r\n' + data + b'\r\n')
 
-        # TODO: behavior appears untested
         if not self.sock:
             self._connect()
 

pymemcache/test/test_client.py

@@ -15,7 +15,9 @@
 
 import collections
 import errno
+import functools
 import json
+import mock
 import socket
 import unittest
 import pytest
@@ -85,7 +87,12 @@ def __getattr__(self, name):
 class ClientTestMixin(object):
     def make_client(self, mock_socket_values, **kwargs):
         client = Client(None, **kwargs)
-        client.sock = MockSocket(list(mock_socket_values))
+        # mock out client._connect() rather than hard-settting client.sock to
+        # ensure methods are checking whether self.sock is None before
+        # attempting to use it
+        sock = MockSocket(list(mock_socket_values))
+        client._connect = mock.Mock(side_effect=functools.partial(
+            setattr, client, "sock", sock))
         return client
 
     def test_set_success(self):