Use 'PYTHON_NODE_CLASS' for node type

Author: sethmlarson

.ci/run-repository.sh

@@ -19,7 +19,7 @@ echo -e "\033[34;1mINFO:\033[0m VERSION ${ELASTICSEARCH_VERSION}\033[0m"
 echo -e "\033[34;1mINFO:\033[0m CONTAINER ${ELASTICSEARCH_CONTAINER}\033[0m"
 echo -e "\033[34;1mINFO:\033[0m TEST_SUITE ${TEST_SUITE}\033[0m"
 echo -e "\033[34;1mINFO:\033[0m PYTHON_VERSION ${PYTHON_VERSION}\033[0m"
-echo -e "\033[34;1mINFO:\033[0m PYTHON_CONNECTION_CLASS ${PYTHON_CONNECTION_CLASS}\033[0m"
+echo -e "\033[34;1mINFO:\033[0m PYTHON_NODE_CLASS ${PYTHON_NODE_CLASS}\033[0m"
 
 echo -e "\033[1m>>>>> Build [elastic/elasticsearch-py container] >>>>>>>>>>>>>>>>>>>>>>>>>>>>>\033[0m"
 
@@ -37,7 +37,7 @@ docker run \
   --env "STACK_VERSION=${STACK_VERSION}" \
   --env "ELASTICSEARCH_URL=${elasticsearch_url}" \
   --env "TEST_SUITE=${TEST_SUITE}" \
-  --env "PYTHON_CONNECTION_CLASS=${PYTHON_CONNECTION_CLASS}" \
+  --env "PYTHON_NODE_CLASS=${PYTHON_NODE_CLASS}" \
   --env "TEST_TYPE=server" \
   --name elasticsearch-py \
   --rm \

.ci/run-tests

@@ -8,7 +8,7 @@
 export STACK_VERSION="${STACK_VERSION:=8.0.0-SNAPSHOT}"
 export TEST_SUITE="${TEST_SUITE:=platinum}"
 export PYTHON_VERSION="${PYTHON_VERSION:=3.9}"
-export PYTHON_CONNECTION_CLASS="${PYTHON_CONNECTION_CLASS:=Urllib3HttpConnection}"
+export PYTHON_NODE_CLASS="${PYTHON_NODE_CLASS:=urllib3}"
 
 script_path=$(dirname $(realpath -s $0))
 source $script_path/functions/imports.sh

.ci/test-matrix.yml

@@ -9,9 +9,10 @@ PYTHON_VERSION:
   - "3.7"
   - "3.8"
   - "3.9"
+  - "3.10"
 
-PYTHON_CONNECTION_CLASS:
-  - Urllib3HttpConnection
-  - RequestsHttpConnection
+PYTHON_NODE_CLASS:
+  - urllib3
+  - requests
 
 exclude: ~

test_elasticsearch/test_server/conftest.py

@@ -40,12 +40,8 @@ def sync_client_factory(elasticsearch_url):
             "ca_certs": CA_CERTS,
             "headers": {"Authorization": "Basic ZWxhc3RpYzpjaGFuZ2VtZQ=="},
         }
-        if "PYTHON_CONNECTION_CLASS" in os.environ:
-            from elasticsearch import connection
-
-            kw["connection_class"] = getattr(
-                connection, os.environ["PYTHON_CONNECTION_CLASS"]
-            )
+        if "PYTHON_NODE_CLASS" in os.environ:
+            kw["node_class"] = os.environ["PYTHON_NODE_CLASS"]
 
         # We do this little dance with the URL to force
         # Requests to respect 'headers: None' within rest API spec tests.

test_elasticsearch/test_server/test_rest_api_spec.py

@@ -121,8 +121,7 @@
 XPACK_FEATURES = None
 ES_VERSION = None
 RUN_ASYNC_REST_API_TESTS = (
-    sys.version_info >= (3, 6)
-    and os.environ.get("PYTHON_CONNECTION_CLASS") == "RequestsHttpConnection"
+    sys.version_info >= (3, 8) and os.environ.get("PYTHON_NODE_CLASS") == "requests"
 )
 
 FALSEY_VALUES = ("", None, False, 0, 0.0)