Handling the cases for UNSET_VALUE, i.e., config is not finalized.

This commit is contained in:
Vidroha Debroy 2019-01-28 13:35:50 -06:00
parent d2c11e81ae
commit 281203edf1
2 changed files with 9 additions and 3 deletions

View File

@ -25,9 +25,10 @@ module VagrantPlugins
# The objective here is to get pip either by default
# or by the argument passed in. The objective is not
# to circumvent the pip setup by passing in nothing.
# Thus, we stick with the default on an empty string.
# Thus, we stick with the default on an empty string
# or if it is an UNSET_VALUE.
if pip_install_cmd.empty?
if pip_install_cmd == Vagrant.plugin("2", :config)::UNSET_VALUE || pip_install_cmd.empty?
pip_install_cmd=DEFAULT_PIP_INSTALL_CMD
end

View File

@ -41,7 +41,12 @@ describe VagrantPlugins::Ansible::Cap::Guest::Pip do
pip_install_command = ""
expect(communicator).to receive(:execute).with("curl https://bootstrap.pypa.io/get-pip.py | sudo python")
subject.get_pip(machine,pip_install_command)
end
end
it "installs pip using the default command if the argument is UNSET_VALUE" do
expect(communicator).to receive(:execute).with("curl https://bootstrap.pypa.io/get-pip.py | sudo python")
subject.get_pip(machine, Vagrant.plugin("2", :config)::UNSET_VALUE)
end
end
end
end