File tree 4 files changed +9
-14
lines changed
4 files changed +9
-14
lines changed Original file line number Diff line number Diff line change 63
63
--name elasticsearch-ruby \
64
64
--rm \
65
65
elastic/elasticsearch-ruby \
66
- bundle exec rake test:download_artifacts test:security
66
+ bundle exec rake test:download_artifacts test:rest_api
67
67
fi
Original file line number Diff line number Diff line change @@ -328,8 +328,10 @@ def clear_auto_follow_patterns(client)
328
328
private
329
329
330
330
def create_x_pack_rest_user ( client )
331
- client . security . put_user ( username : 'x_pack_rest_user' ,
332
- body : { password : 'x-pack-test-password' , roles : [ 'superuser' ] } )
331
+ client . security . put_user (
332
+ username : 'x_pack_rest_user' ,
333
+ body : { password : 'x-pack-test-password' , roles : [ 'superuser' ] }
334
+ )
333
335
end
334
336
335
337
def clear_roles ( client )
Original file line number Diff line number Diff line change 47
47
next
48
48
end
49
49
50
- let ( :client ) do
51
- DEFAULT_CLIENT
52
- end
53
-
54
- # Runs once before each test in a test file
55
- before ( :all ) do
56
- test_file . setup
57
- end
58
-
50
+ let ( :client ) { DEFAULT_CLIENT }
51
+ before ( :all ) { test_file . setup }
59
52
after ( :all ) do
60
53
test_file . teardown
61
54
Elasticsearch ::RestAPIYAMLTests ::TestFile . wipe_cluster ( ADMIN_CLIENT )
Original file line number Diff line number Diff line change @@ -53,14 +53,14 @@ namespace :test do
53
53
desc 'Run rest api tests'
54
54
task rest_api : [ 'elasticsearch:wait_for_green' ] do
55
55
puts '-' * 80
56
- sh "cd #{ CURRENT_PATH . join ( 'elasticsearch-api' ) } && unset BUNDLE_GEMFILE && bundle exec rake test:rest_api[true] "
56
+ sh "cd #{ CURRENT_PATH . join ( 'elasticsearch-api' ) } && unset BUNDLE_GEMFILE && bundle exec rake test:rest_api"
57
57
puts "\n "
58
58
end
59
59
60
60
desc 'Run security (Platinum) rest api yaml tests'
61
61
task security : 'elasticsearch:wait_for_green' do
62
62
puts '-' * 80
63
- sh "cd #{ CURRENT_PATH . join ( 'elasticsearch-api' ) } && unset BUNDLE_GEMFILE && bundle exec rake test:platinum_api "
63
+ sh "cd #{ CURRENT_PATH . join ( 'elasticsearch-api' ) } && unset BUNDLE_GEMFILE && TEST_SUITE=platinum bundle exec rake test:rest_api "
64
64
puts "\n "
65
65
end
66
66
You can’t perform that action at this time.
0 commit comments