From 7ef8477e4350d98135b37f681d8ca7d5c026e0d0 Mon Sep 17 00:00:00 2001 From: jjshoe Date: Wed, 16 Apr 2014 15:26:19 -0500 Subject: [PATCH] provisioners/ansible: Don't run with two --limits Conflicts: test/unit/plugins/provisioners/ansible/provisioner_test.rb --- plugins/provisioners/ansible/provisioner.rb | 2 +- .../plugins/provisioners/ansible/provisioner_test.rb | 12 +++--------- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/plugins/provisioners/ansible/provisioner.rb b/plugins/provisioners/ansible/provisioner.rb index 3db76741a..11709f64b 100644 --- a/plugins/provisioners/ansible/provisioner.rb +++ b/plugins/provisioners/ansible/provisioner.rb @@ -26,7 +26,7 @@ module VagrantPlugins # By default we limit by the current machine. # This can be overridden by the limit config option. - options << "--limit=#{@machine.name}" + options << "--limit=#{@machine.name}" unless config.limit # # 2) Configuration Joker diff --git a/test/unit/plugins/provisioners/ansible/provisioner_test.rb b/test/unit/plugins/provisioners/ansible/provisioner_test.rb index 644c823a9..b1475ba33 100644 --- a/test/unit/plugins/provisioners/ansible/provisioner_test.rb +++ b/test/unit/plugins/provisioners/ansible/provisioner_test.rb @@ -330,14 +330,8 @@ VF config.limit = %w(foo !bar) end - it_should_set_arguments_and_environment_variables 6 + it_should_set_arguments_and_environment_variables 5 it_should_set_optional_arguments({ "limit" => "--limit=foo,!bar" }) - - it "sets custom limit argument after implicit default limit" do - expect(Vagrant::Util::Subprocess).to receive(:execute).with { |*args| - expect(args.index("--limit=foo,!bar")).to be > args.index("--limit=#{machine.name}") - } - end end describe "with inventory_path option" do @@ -440,7 +434,7 @@ VF end # Note: - # The Vagrant Ansible provisioner does not validate the coherency of arguments combination, + # The Vagrant Ansible provisioner does not validate the coherency of argument combinations, # and let ansible-playbook complain. describe "with a maximum of options" do before do @@ -463,7 +457,7 @@ VF config.raw_ssh_args = ['-o ControlMaster=no'] end - it_should_set_arguments_and_environment_variables 20, 4, true + it_should_set_arguments_and_environment_variables 19, 4, true it_should_force_ssh_transport_mode it_should_set_optional_arguments({ "extra_vars" => "--extra-vars=@#{File.expand_path(__FILE__)}", "sudo" => "--sudo",