haskal
/
vagrant
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

provisioners/ansible: try to improve unit tests 

I still cannot explain the cause of these random errors in this unit test,
but it is anyway safe and suitable to update the test code as following:
- use stricter regular expression matching (-l is included in --limit)
- array lengths substraction instead of array contents substraction
This commit is contained in:
Gilles Cornu 2014-05-05 09:08:10 +02:00
parent 844fa27bc3
commit e884dfad71
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
test/unit/plugins/provisioners/ansible/provisioner_test.rb
View File

@ -68,7 +68,7 @@ VF
expect(args[1]).to eq("--private-key=#{machine.ssh_info[:private_key_path][0]}")
expect(args[2]).to eq("--user=#{machine.ssh_info[:username]}")
inventory_count = args.count { |x| x =~ /--inventory-file=.+/ }
inventory_count = args.count { |x| x =~ /^--inventory-file=.+$/ }
expect(inventory_count).to be > 0
expect(args[args.length-2]).to eq("playbook.yml")
@ -79,10 +79,10 @@ VF
expect(Vagrant::Util::Subprocess).to receive(:execute).with { |*args|
raw_limits = []
if config.raw_arguments
raw_limits = config.raw_arguments.select { |x| x =~ /--limit=|-l/ }
raw_limits = config.raw_arguments.select { |x| x =~ /^(--limit=|-l)/ }
end
all_limits = args.select { |x| x =~ /--limit=|-l/ }
expect((all_limits - raw_limits).length).to eq(1)
all_limits = args.select { |x| x =~ /^(--limit=|-l)/ }
expect(all_limits.length - raw_limits.length).to eq(1)
if config.limit
limit = config.limit.kind_of?(Array) ? config.limit.join(',') : config.limit
@ -136,7 +136,7 @@ VF
it "does not force any transport mode" do
expect(Vagrant::Util::Subprocess).to receive(:execute).with { |*args|
total = args.count { |x| x =~ /--connection=\w+/ }
total = args.count { |x| x =~ /^--connection=\w+$/ }
expect(total).to eql(0)
}
end