Fix new behavior in ElasticSearch 7 (#309)

* Fix new behavior in elasticsearch07

* Fix collision in tox naming

Author: TimPansino

.github/workflows/tests.yml

@@ -832,7 +832,7 @@ jobs:
         TOX_PARALLEL_NO_SPINNER: 1
         PY_COLORS: 0
 
-  elasticsearch:
+  elasticsearchserver01:
     env: 
       TOTAL_GROUPS: 1
 
@@ -917,6 +917,91 @@ jobs:
         TOX_PARALLEL_NO_SPINNER: 1
         PY_COLORS: 0
 
+  elasticsearchserver07:
+    env: 
+      TOTAL_GROUPS: 1
+
+    strategy:
+      matrix:
+        group-number: [1]
+
+    runs-on: ubuntu-latest
+
+    services:
+      es01:
+        image: elasticsearch:7.13.2
+        env:
+          "discovery.type": "single-node"
+        ports:
+          - 8080:9200
+          - 8081:9200
+        # Set health checks to wait until elasticsearch has started
+        options: >-
+          --health-cmd "curl --silent --fail localhost:9200/_cluster/health || exit 1"
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+
+    steps:
+    - uses: actions/checkout@v2
+
+    # Set up all versions of python
+    - uses: actions/setup-python@v2
+      with:
+        python-version: pypy3
+        architecture: x64
+
+    # Set up pypy2 after pypy3 to ensure pypy isn't aliased to pypy3
+    - uses: actions/setup-python@v2
+      with:
+        python-version: pypy2
+        architecture: x64
+
+    - uses: actions/setup-python@v2
+      with:
+        python-version: 2.7
+        architecture: x64
+
+    - uses: actions/setup-python@v2
+      with:
+        python-version: 3.6
+        architecture: x64
+
+    - uses: actions/setup-python@v2
+      with:
+        python-version: 3.7
+        architecture: x64
+
+    - uses: actions/setup-python@v2
+      with:
+        python-version: 3.8
+        architecture: x64
+
+    # Set up python 3.9 last to ensure tox runs CPython
+    - uses: actions/setup-python@v2
+      with:
+        python-version: 3.9
+        architecture: x64
+
+    - name: Install Dependencies
+      run: |
+        pip install -U pip
+        pip install -U wheel setuptools tox virtualenv!=20.0.24
+
+    - name: Get Environments
+      id: get-envs
+      run: |
+        echo "::set-output name=envs::$(tox -l | grep "^${{ github.job }}\-" | ./.github/workflows/get-envs.py)"
+      env:
+        GROUP_NUMBER: ${{ matrix.group-number }}
+
+    - name: Test
+      run: |
+        tox -vv -e ${{ steps.get-envs.outputs.envs }} -p auto
+      env:
+        TOX_PARALLEL_NO_SPINNER: 1
+        PY_COLORS: 0
+
   gearman:
     env: 
       TOTAL_GROUPS: 1

tox.ini

@@ -64,16 +64,16 @@ envlist =
     python-cross_agent-pypy-without_extensions,
     postgres-datastore_asyncpg-{py36,py37,py38,py39},
     memcached-datastore_bmemcached-{pypy,py27,py36,py37,py38,py39}-memcached030,
-    elasticsearch-datastore_elasticsearch-py27-elasticsearch{00,01,02,05},
-    elasticsearch-datastore_elasticsearch-{py27,py36,py37,py38,py39,pypy,pypy3}-elasticsearch{07},
+    elasticsearchserver01-datastore_pyelasticsearch-{py27,py36,pypy},
+    elasticsearchserver01-datastore_elasticsearch-py27-elasticsearch{00,01,02,05},
+    elasticsearchserver07-datastore_elasticsearch-{py27,py36,py37,py38,py39,pypy,pypy3}-elasticsearch{07},
     memcached-datastore_memcache-{py27,py36,py37,py38,py39,pypy,pypy3}-memcached01,
     mysql-datastore_mysql-mysql080023-py27,
     mysql-datastore_mysql-mysqllatest-{py36,py37,py38},
     postgres-datastore_postgresql-{py36,py37,py38,py39},
     postgres-datastore_psycopg2-{py27,py36,py37,py38}-psycopg20208,
     postgres-datastore_psycopg2cffi-{py27,py36,pypy}-psycopg2cffi{0207,0208},
     postgres-datastore_psycopg2cffi-py37-psycopg2cffi0208,
-    elasticsearch-datastore_pyelasticsearch-{py27,py36,pypy},
     memcached-datastore_pylibmc-{py27,py36,py37},
     memcached-datastore_pymemcache-{py27,py36,py37,py38,py39,pypy,pypy3},
     mongodb-datastore_pymongo-{py27,py36,py37,py38,py39,pypy}-pymongo{02,03},