File tree Expand file tree Collapse file tree 3 files changed +27
-4
lines changed Expand file tree Collapse file tree 3 files changed +27
-4
lines changed Original file line number Diff line number Diff line change @@ -31,6 +31,10 @@ docker build \
31
31
32
32
echo -e " \033[1m>>>>> Run [elastic/elasticsearch-py container] >>>>>>>>>>>>>>>>>>>>>>>>>>>>>\033[0m"
33
33
34
+ if [[ " $STACK_VERSION " == " 8.0.0-SNAPSHOT" ]]; then
35
+ ELASTIC_CLIENT_APIVERSIONING=" 1"
36
+ fi
37
+
34
38
mkdir -p junit
35
39
docker run \
36
40
--network=${network_name} \
@@ -39,6 +43,7 @@ docker run \
39
43
--env " TEST_SUITE=${TEST_SUITE} " \
40
44
--env " PYTHON_CONNECTION_CLASS=${PYTHON_CONNECTION_CLASS} " \
41
45
--env " TEST_TYPE=server" \
46
+ --env " ELASTIC_CLIENT_APIVERSIONING=${ELASTIC_CLIENT_APIVERSIONING:- false} " \
42
47
--name elasticsearch-py \
43
48
--rm \
44
49
elastic/elasticsearch-py \
Original file line number Diff line number Diff line change 1
1
STACK_VERSION :
2
2
- 7.x-SNAPSHOT
3
+ - 8.0.0-SNAPSHOT
3
4
4
5
TEST_SUITE :
5
6
- platinum
@@ -17,4 +18,15 @@ PYTHON_CONNECTION_CLASS:
17
18
- Urllib3HttpConnection
18
19
- RequestsHttpConnection
19
20
20
- exclude : ~
21
+ exclude :
22
+ # TODO: Remove for 7.16 branch
23
+ - STACK_VERSION : 8.0.0-SNAPSHOT
24
+ PYTHON_VERSION : " 3.4"
25
+ - STACK_VERSION : 8.0.0-SNAPSHOT
26
+ PYTHON_VERSION : " 3.5"
27
+ - STACK_VERSION : 8.0.0-SNAPSHOT
28
+ PYTHON_VERSION : " 3.6"
29
+ - STACK_VERSION : 8.0.0-SNAPSHOT
30
+ PYTHON_VERSION : " 3.7"
31
+ - STACK_VERSION : 8.0.0-SNAPSHOT
32
+ PYTHON_VERSION : " 3.8"
Original file line number Diff line number Diff line change @@ -143,7 +143,11 @@ def wipe_searchable_snapshot_indices(client):
143
143
144
144
def wipe_xpack_templates (client ):
145
145
templates = [
146
- x .strip () for x in client .cat .templates (h = "name" ).split ("\n " ) if x .strip ()
146
+ x .strip ()
147
+ for x in client .cat .templates (h = "name" , headers = {"accept" : "text/plain" }).split (
148
+ "\n "
149
+ )
150
+ if x .strip ()
147
151
]
148
152
for template in templates :
149
153
if is_xpack_template (template ):
@@ -221,8 +225,10 @@ def wipe_tasks(client):
221
225
def wait_for_pending_tasks (client , filter , timeout = 30 ):
222
226
end_time = time .time () + timeout
223
227
while time .time () < end_time :
224
- tasks = client .cat .tasks (detailed = True ).split ("\n " )
225
- if not any (filter in task for task in tasks ):
228
+ tasks = client .cat .tasks (detailed = True , headers = {"accept" : "text/plain" }).split (
229
+ "\n "
230
+ )
231
+ if not any (filter in str (task ) for task in tasks ):
226
232
break
227
233
228
234
You can’t perform that action at this time.
0 commit comments