santerikainulainen/ansible-role-elasticsearch
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Multi tests fixed to test for mlockall and no work dir

Browse source
This commit is contained in:
Dale McDiarmid 2017-01-16 11:36:05 +00:00
parent dcbebf79c6
commit 3218191ee0
2 changed files with 3 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
test/integration/helpers/serverspec/multi_spec.rb
View file

@ -29,7 +29,6 @@ shared_examples 'multi::init' do |es_version,plugins|
it { should_not contain 'bootstrap.memory_lock: true' } it { should_not contain 'bootstrap.memory_lock: true' }
it { should contain 'path.conf: /etc/elasticsearch/node1' } it { should contain 'path.conf: /etc/elasticsearch/node1' }
it { should contain 'path.data: /opt/elasticsearch/data-1/localhost-node1,/opt/elasticsearch/data-2/localhost-node1' } it { should contain 'path.data: /opt/elasticsearch/data-1/localhost-node1,/opt/elasticsearch/data-2/localhost-node1' }
it { should contain 'path.work: /tmp/elasticsearch/localhost-node1' }
it { should contain 'path.logs: /var/log/elasticsearch/localhost-node1' } it { should contain 'path.logs: /var/log/elasticsearch/localhost-node1' }
end end
@ -45,7 +44,6 @@ shared_examples 'multi::init' do |es_version,plugins|
it { should contain 'bootstrap.memory_lock: true' } it { should contain 'bootstrap.memory_lock: true' }
it { should contain 'path.conf: /etc/elasticsearch/master' } it { should contain 'path.conf: /etc/elasticsearch/master' }
it { should contain 'path.data: /opt/elasticsearch/master/localhost-master' } it { should contain 'path.data: /opt/elasticsearch/master/localhost-master' }
it { should contain 'path.work: /tmp/elasticsearch/localhost-master' }
it { should contain 'path.logs: /var/log/elasticsearch/localhost-master' } it { should contain 'path.logs: /var/log/elasticsearch/localhost-master' }
end end
@ -144,13 +142,13 @@ shared_examples 'multi::init' do |es_version,plugins|
end end
#test to make sure mlock was applied #test to make sure mlock was applied
describe command('curl -s "localhost:9200/_nodes/localhost-master/process?pretty=true" | grep memory_lock') do describe command('curl -s "localhost:9200/_nodes/localhost-master/process?pretty=true" | grep mlockall') do
its(:stdout) { should match /true/ } its(:stdout) { should match /true/ }
its(:exit_status) { should eq 0 } its(:exit_status) { should eq 0 }
end end
#test to make sure mlock was not applied #test to make sure mlock was not applied
describe command('curl -s "localhost:9201/_nodes/localhost-node1/process?pretty=true" | grep memory_lock') do describe command('curl -s "localhost:9201/_nodes/localhost-node1/process?pretty=true" | grep mlockall') do
its(:stdout) { should match /false/ } its(:stdout) { should match /false/ }
its(:exit_status) { should eq 0 } its(:exit_status) { should eq 0 }
end end

2
test/integration/multi-5x/serverspec/default_spec.rb
View file

@ -2,7 +2,7 @@ require 'multi_spec'
describe 'Multi Tests v 5.x' do describe 'Multi Tests v 5.x' do
include_examples 'multi::init', "5.1.2", ["kopf"] include_examples 'multi::init', "5.1.2", ["ingest-geoip"]
end end