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

Merge pull request #3632 from gildegoma/ansible-random-errors 

provisioners/ansible: try to improve unit tests
This commit is contained in:
Mitchell Hashimoto 2014-05-05 09:21:54 -07:00
parent 844fa27bc3 e884dfad71
commit ec8b6b22ee
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[1]).to eq("--private-key=#{machine.ssh_info[:private_key_path][0]}")
expect(args[2]).to eq("--user=#{machine.ssh_info[:username]}") 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(inventory_count).to be > 0
expect(args[args.length-2]).to eq("playbook.yml") expect(args[args.length-2]).to eq("playbook.yml")
@ -79,10 +79,10 @@ VF
expect(Vagrant::Util::Subprocess).to receive(:execute).with { |*args| expect(Vagrant::Util::Subprocess).to receive(:execute).with { |*args|
raw_limits = [] raw_limits = []
if config.raw_arguments 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 end
all_limits = args.select { |x| x =~ /--limit=|-l/ } all_limits = args.select { |x| x =~ /^(--limit=|-l)/ }
expect((all_limits - raw_limits).length).to eq(1) expect(all_limits.length - raw_limits.length).to eq(1)
if config.limit if config.limit
limit = config.limit.kind_of?(Array) ? config.limit.join(',') : 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 it "does not force any transport mode" do
expect(Vagrant::Util::Subprocess).to receive(:execute).with { |*args| 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) expect(total).to eql(0)
} }
end end