Use api_execute for getting the version of the cluster

This will allow the same kind of safety net everything gets besides the
fetch of machines.

Author: lavagetto

src/etcd/client.py

@@ -214,12 +214,8 @@ def _set_version_info(self):
         Sets the version information provided by the server.
         """
         # Set the version
-        version_info = json.loads(self.http.request(
-            self._MGET,
-            self._base_uri + '/version',
-            headers=self._get_headers(),
-            timeout=self.read_timeout,
-            redirect=self.allow_redirect).data.decode('utf-8'))
+        data = self.api_execute('/version', self._MGET).data
+        version_info = json.loads(data.decode('utf-8'))
         self._version = version_info['etcdserver']
         self._cluster_version = version_info['etcdcluster']
 
@@ -856,7 +852,7 @@ def wrapper(self, path, method, params=None, timeout=None):
                     # Check the cluster ID hasn't changed under us.  We use
                     # preload_content=False above so we can read the headers
                     # before we wait for the content of a watch.
-                    self._check_cluster_id(response)
+                    self._check_cluster_id(response, path)
                     # Now force the data to be preloaded in order to trigger any
                     # IO-related errors in this method rather than when we try to
                     # access it later.
@@ -950,10 +946,11 @@ def api_execute_json(self, path, method, params=None, timeout=None):
                                  headers=headers,
                                  preload_content=False)
 
-    def _check_cluster_id(self, response):
+    def _check_cluster_id(self, response, path):
         cluster_id = response.getheader("x-etcd-cluster-id")
         if not cluster_id:
-            _log.warning("etcd response did not contain a cluster ID")
+            if self.version_prefix in path:
+                _log.warning("etcd response did not contain a cluster ID")
             return
         id_changed = (self.expected_cluster_id and
                       cluster_id != self.expected_cluster_id)

src/etcd/tests/unit/test_client.py

@@ -3,13 +3,15 @@
 import dns.name
 import dns.rdtypes.IN.SRV
 import dns.resolver
+from etcd.tests.unit import TestClientApiBase
 try:
     import mock
 except ImportError:
     from unittest import mock
 
 
-class TestClient(unittest.TestCase):
+class TestClient(TestClientApiBase):
+
 
     def test_instantiate(self):
         """ client can be instantiated"""
@@ -123,55 +125,37 @@ def test_get_headers_with_auth(self):
 
     def test__set_version_info(self):
         """Verify _set_version_info makes the proper call to the server"""
-        with mock.patch('urllib3.PoolManager') as _pm:
-            _request = _pm().request
-            # Return the expected data type
-            _request.return_value = mock.MagicMock(
-                data=b'{"etcdserver": "2.2.3", "etcdcluster": "2.3.0"}')
-
-            # Create the client and make the call.
-            client = etcd.Client()
-            client._set_version_info()
-
-            # Verify we call the proper endpoint
-            _request.assert_called_once_with(
-                client._MGET,
-                client._base_uri + '/version',
-                headers=mock.ANY,
-                redirect=mock.ANY,
-                timeout=mock.ANY)
-
-            # Verify the properties while we are here
-            self.assertEquals('2.2.3', client.version)
-            self.assertEquals('2.3.0', client.cluster_version)
+        data = {"etcdserver": "2.2.3", "etcdcluster": "2.3.0"}
+        self._mock_api(200, data)
+        self.client.api_execute.return_value.getheader.return_value = None
+        # Create the client and make the call.
+        self.client._set_version_info()
+
+        # Verify we call the proper endpoint
+        self.client.api_execute.assert_called_once_with(
+            '/version',
+            self.client._MGET
+        )
+        # Verify the properties while we are here
+        self.assertEquals('2.2.3', self.client.version)
+        self.assertEquals('2.3.0', self.client.cluster_version)
 
     def test_version_property(self):
         """Ensure the version property is set on first access."""
-        with mock.patch('urllib3.PoolManager') as _pm:
-            _request = _pm().request
-            # Return the expected data type
-            _request.return_value = mock.MagicMock(
-                data=b'{"etcdserver": "2.2.3", "etcdcluster": "2.3.0"}')
-
-            # Create the client.
-            client = etcd.Client()
+        data = {"etcdserver": "2.2.3", "etcdcluster": "2.3.0"}
+        self._mock_api(200, data)
+        self.client.api_execute.return_value.getheader.return_value = None
 
-            # Verify the version property is set
-            self.assertEquals('2.2.3', client.version)
+        # Verify the version property is set
+        self.assertEquals('2.2.3', self.client.version)
 
     def test_cluster_version_property(self):
         """Ensure the cluster version property is set on first access."""
-        with mock.patch('urllib3.PoolManager') as _pm:
-            _request = _pm().request
-            # Return the expected data type
-            _request.return_value = mock.MagicMock(
-                data=b'{"etcdserver": "2.2.3", "etcdcluster": "2.3.0"}')
-
-            # Create the client.
-            client = etcd.Client()
-
-            # Verify the cluster_version property is set
-            self.assertEquals('2.3.0', client.cluster_version)
+        data = {"etcdserver": "2.2.3", "etcdcluster": "2.3.0"}
+        self._mock_api(200, data)
+        self.client.api_execute.return_value.getheader.return_value = None
+        # Verify the cluster_version property is set
+        self.assertEquals('2.3.0', self.client.cluster_version)
 
     def test_get_headers_without_auth(self):
         client = etcd.Client()