File tree Expand file tree Collapse file tree 4 files changed +3
-9
lines changed
lib/elasticsearch/transport
spec/elasticsearch/transport
elasticsearch-xpack/spec/xpack Expand file tree Collapse file tree 4 files changed +3
-9
lines changed Original file line number Diff line number Diff line change @@ -134,7 +134,7 @@ def wipe_rollup_jobs(client)
134
134
def wait_for_pending_rollup_tasks ( client )
135
135
filter = 'xpack/rollup/job'
136
136
loop do
137
- results = client . cat . tasks ( detailed : true )
137
+ results = client . cat . tasks ( detailed : true ) . split ( " \n " )
138
138
count = 0
139
139
140
140
time = Time . now . to_i
Original file line number Diff line number Diff line change @@ -211,7 +211,7 @@ def set_compatibility_header
211
211
212
212
add_header (
213
213
{
214
- 'Accept' => 'application/vnd.elasticsearch+json;compatible-with=7' ,
214
+ 'Accept' => 'application/vnd.elasticsearch+json; compatible-with=7' ,
215
215
'Content-Type' => 'application/vnd.elasticsearch+json; compatible-with=7'
216
216
}
217
217
)
Original file line number Diff line number Diff line change 1432
1432
headers = client . transport . connections . first . connection . headers
1433
1433
1434
1434
expect ( headers [ 'Content-Type' ] ) . to eq ( 'application/vnd.elasticsearch+json; compatible-with=7' )
1435
- expect ( headers [ 'Accept' ] ) . to eq ( 'application/vnd.elasticsearch+json;compatible-with=7' )
1436
-
1437
- response = client . perform_request ( 'GET' , '/' )
1438
- expect ( response . headers [ 'content-type' ] ) . to eq ( 'application/json; charset=UTF-8' )
1435
+ expect ( headers [ 'Accept' ] ) . to eq ( 'application/vnd.elasticsearch+json; compatible-with=7' )
1439
1436
1440
1437
ENV . delete ( 'ELASTIC_CLIENT_APIVERSIONING' )
1441
1438
end
Original file line number Diff line number Diff line change 65
65
ADMIN_CLIENT . xpack . watcher . delete_watch ( id : 'my_watch' )
66
66
rescue Elasticsearch ::Transport ::Transport ::Errors ::NotFound
67
67
end
68
- # todo: remove these two lines when Dimitris' PR is merged
69
- ADMIN_CLIENT . cluster . put_settings ( body : { transient : { 'xpack.ml.max_model_memory_limit' => nil } } )
70
- ADMIN_CLIENT . cluster . put_settings ( body : { persistent : { 'xpack.ml.max_model_memory_limit' => nil } } )
71
68
test_file . setup
72
69
end
73
70
You can’t perform that action at this time.
0 commit comments