From 79365f378928c55987ed4828ea78717a813a4aaa Mon Sep 17 00:00:00 2001 From: Jonathan LaBroad Date: Thu, 5 Oct 2017 06:55:53 -0400 Subject: [PATCH] Test that linux flags don't get passed to Windows Salt minion bootstrap --- .../provisioners/salt/provisioner_test.rb | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/test/unit/plugins/provisioners/salt/provisioner_test.rb b/test/unit/plugins/provisioners/salt/provisioner_test.rb index 8ebf3b846..d128fdf0a 100644 --- a/test/unit/plugins/provisioners/salt/provisioner_test.rb +++ b/test/unit/plugins/provisioners/salt/provisioner_test.rb @@ -30,7 +30,22 @@ describe VagrantPlugins::Salt::Provisioner do end describe "#provision" do - + context "minion" do + it "does not add linux-only bootstrap flags when on windows" do + additional_windows_options = "-these options -should -remain" + allow(config).to receive(:seed_master).and_return(true) + allow(config).to receive(:install_master).and_return(true) + allow(config).to receive(:install_syndic).and_return(true) + allow(config).to receive(:no_minion).and_return(true) + allow(config).to receive(:install_type).and_return('stable') + allow(config).to receive(:install_args).and_return('develop') + allow(config).to receive(:verbose).and_return(true) + allow(machine.config.vm).to receive(:communicator).and_return(:winrm) + allow(config).to receive(:bootstrap_options).and_return(additional_windows_options) + result = subject.bootstrap_options(true, true, "C:\\salttmp") + expect(result.strip).to eq(additional_windows_options) + end + end end describe "#call_highstate" do