Requested changes

Author: V1NAY8

test_elasticsearch/test_client/common.py

@@ -17,14 +17,13 @@
 
 from collections import defaultdict
 
-from elasticsearch.client import Elasticsearch
-from elasticsearch.connection import Connection
+from elasticsearch import Elasticsearch
 
 
-class DummyTransport(Connection):
-    def __init__(self, hosts, **kwargs):
+class DummyTransport(object):
+    def __init__(self, hosts, responses=None, **_):
         self.hosts = hosts
-        self.responses = kwargs.pop("responses", None)
+        self.responses = responses
         self.call_count = 0
         self.calls = defaultdict(list)
 
@@ -41,8 +40,11 @@ class DummyTransportTestCase:
     def setup_method(self, _):
         self.client = Elasticsearch(transport_class=DummyTransport)
 
-    def assert_helper(self, method, url, count=1):
-        calls = self.client.transport.calls
-        assert (method, url) in calls
-        assert count == len(calls[(method, url)])
-        return calls[(method, url)]
+    def assert_call_count_equals(self, count):
+        assert count == self.client.transport.call_count
+
+    def assert_url_called(self, method, url, count=1):
+        assert (method, url) in self.client.transport.calls
+        calls = self.client.transport.calls[(method, url)]
+        assert count == len(calls)
+        return calls

test_elasticsearch/test_client/test_client.py

@@ -26,28 +26,28 @@
 class TestClient(DummyTransportTestCase):
     def test_request_timeout_is_passed_through_unescaped(self):
         self.client.ping(request_timeout=0.1)
-        calls = self.assert_helper("HEAD", "/")
+        calls = self.assert_url_called("HEAD", "/")
         assert [({"request_timeout": 0.1}, {}, None)] == calls
 
     def test_params_is_copied_when(self):
         params = {"request_timeout": object()}
         self.client.ping(params=params)
         self.client.ping(params=params)
-        calls = self.assert_helper("HEAD", "/", 2)
+        calls = self.assert_url_called("HEAD", "/", 2)
         assert [(params, {}, None), (params, {}, None)] == calls
         assert calls[0][0] is not calls[1][0]
 
     def test_headers_is_copied_when(self):
         headers = {"authentication": "value"}
         self.client.ping(headers=headers)
         self.client.ping(headers=headers)
-        calls = self.assert_helper("HEAD", "/", 2)
+        calls = self.assert_url_called("HEAD", "/", 2)
         assert [({}, headers, None), ({}, headers, None)] == calls
         assert calls[0][0] is not calls[1][0]
 
     def test_from_in_search(self):
         self.client.search(index="i", from_=10)
-        calls = self.assert_helper("POST", "/i/_search")
+        calls = self.assert_url_called("POST", "/i/_search")
         assert [({"from": b"10"}, {}, None)] == calls
 
     def test_repr_contains_hosts(self):
@@ -74,4 +74,4 @@ def test_repr_truncates_host_to_5(self):
     )
     def test_index_uses_id(self, id, request_method, url):
         self.client.index(index="my-index", id=id, body={})
-        self.assert_helper(request_method, url)
+        self.assert_url_called(request_method, url)

test_elasticsearch/test_client/test_cluster.py

@@ -27,7 +27,7 @@ def test_stats_node_id(self, node_id):
         url = "/_cluster/stats"
         if node_id:
             url += "/nodes/" + node_id
-        self.assert_helper("GET", url)
+        self.assert_url_called("GET", url)
 
     @pytest.mark.parametrize(
         ["index", "metric", "url_suffix"],
@@ -45,4 +45,4 @@ def test_state_with_index_without_metric_defaults_to_all(
         url = "/_cluster/state"
         if url_suffix:
             url += url_suffix
-        self.assert_helper("GET", url)
+        self.assert_url_called("GET", url)

test_elasticsearch/test_client/test_indices.py

@@ -23,15 +23,15 @@
 class TestIndices(DummyTransportTestCase):
     def test_create_one_index(self):
         self.client.indices.create("test-index")
-        self.assert_helper("PUT", "/test-index")
+        self.assert_url_called("PUT", "/test-index")
 
     def test_delete_multiple_indices(self):
         self.client.indices.delete(["test-index", "second.index", "third/index"])
-        self.assert_helper("DELETE", "/test-index,second.index,third%2Findex")
+        self.assert_url_called("DELETE", "/test-index,second.index,third%2Findex")
 
     def test_exists_index(self):
         self.client.indices.exists("second.index,third/index")
-        self.assert_helper("HEAD", "/second.index,third%2Findex")
+        self.assert_url_called("HEAD", "/second.index,third%2Findex")
 
     @pytest.mark.parametrize("index", [None, [], ""])
     def test_passing_empty_value_for_required_param_raises_exception(self, index):

test_elasticsearch/test_client/test_overrides.py

@@ -28,28 +28,28 @@ class TestOverriddenUrlTargets(DummyTransportTestCase):
     )
     def test_create(self, doc_type, url_suffix):
         self.client.create(index="test-index", doc_type=doc_type, id="test-id", body={})
-        self.assert_helper("PUT", "/test-index" + url_suffix)
+        self.assert_url_called("PUT", "/test-index" + url_suffix)
 
     @pytest.mark.parametrize(
         ["doc_type", "url_suffix"],
         [(None, "/_doc/test-id"), ("test-type", "/test-type/test-id")],
     )
     def test_delete(self, doc_type, url_suffix):
         self.client.delete(index="test-index", doc_type=doc_type, id="test-id")
-        self.assert_helper("DELETE", "/test-index" + url_suffix)
+        self.assert_url_called("DELETE", "/test-index" + url_suffix)
 
     @pytest.mark.parametrize(
         ["doc_type", "url_suffix"],
         [(None, "/_update/test-id"), ("test-type", "/test-type/test-id/_update")],
     )
     def test_update(self, doc_type, url_suffix):
         self.client.update(index="test-index", doc_type=doc_type, id="test-id", body={})
-        self.assert_helper("POST", "/test-index" + url_suffix)
+        self.assert_url_called("POST", "/test-index" + url_suffix)
 
     @pytest.mark.parametrize(
         ["request_method", "id", "url_suffix"],
         [("POST", None, ""), ("PUT", "test-id", "/test-id")],
     )
     def test_index(self, request_method, id, url_suffix):
         self.client.index(index="test-index", id=id, body={})
-        self.assert_helper(request_method, "/test-index/_doc" + url_suffix)
+        self.assert_url_called(request_method, "/test-index/_doc" + url_suffix)