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

Use `command -v` for checks in all inspection helpers. Fix stubs in tests.

This commit is contained in:
Chris Roberts 2018-09-21 09:19:40 -07:00
parent bc217d5e57
commit 8fd05fe3c1
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/vagrant/util/guest_inspection.rb
View File

@ -47,7 +47,7 @@ module Vagrant
# @param [Vagrant::Plugin::V2::Communicator] comm Guest communicator # @param [Vagrant::Plugin::V2::Communicator] comm Guest communicator
# @return [Boolean] # @return [Boolean]
def netplan?(comm) def netplan?(comm)
comm.test("netplan -h") comm.test("command -v netplan")
end end
## nmcli helpers ## nmcli helpers
@ -57,7 +57,7 @@ module Vagrant
# @param [Vagrant::Plugin::V2::Communicator] comm Guest communicator # @param [Vagrant::Plugin::V2::Communicator] comm Guest communicator
# @return [Boolean] # @return [Boolean]
def nmcli?(comm) def nmcli?(comm)
comm.test("nmcli -t") comm.test("command -v nmcli")
end end
# NetworkManager currently controls device # NetworkManager currently controls device

14
test/unit/plugins/guests/debian/cap/configure_networks_test.rb
View File

@ -67,9 +67,9 @@ describe "VagrantPlugins::GuestDebian::Cap::ConfigureNetworks" do
before do before do
allow(comm).to receive(:test).with("nmcli -t d show eth1").and_return(false) allow(comm).to receive(:test).with("nmcli -t d show eth1").and_return(false)
allow(comm).to receive(:test).with("nmcli -t d show eth2").and_return(false) allow(comm).to receive(:test).with("nmcli -t d show eth2").and_return(false)
allow(comm).to receive(:test).with("sudo ps -o comm= 1 | grep systemd").and_return(false) allow(comm).to receive(:test).with("ps -o comm= 1 | grep systemd").and_return(false)
allow(comm).to receive(:test).with("sudo systemctl status systemd-networkd.service").and_return(false) allow(comm).to receive(:test).with("systemctl -q is-active systemd-networkd.service", anything).and_return(false)
allow(comm).to receive(:test).with("netplan -h").and_return(false) allow(comm).to receive(:test).with("command -v netplan").and_return(false)
end end
it "creates and starts the networks using net-tools" do it "creates and starts the networks using net-tools" do
@ -85,8 +85,8 @@ describe "VagrantPlugins::GuestDebian::Cap::ConfigureNetworks" do
context "with systemd" do context "with systemd" do
before do before do
expect(comm).to receive(:test).with("sudo ps -o comm= 1 | grep systemd").and_return(true) expect(comm).to receive(:test).with("ps -o comm= 1 | grep systemd").and_return(true)
allow(comm).to receive(:test).with("netplan -h").and_return(false) allow(comm).to receive(:test).with("command -v netplan").and_return(false)
end end
it "creates and starts the networks using net-tools" do it "creates and starts the networks using net-tools" do
@ -102,7 +102,7 @@ describe "VagrantPlugins::GuestDebian::Cap::ConfigureNetworks" do
context "with systemd-networkd" do context "with systemd-networkd" do
before do before do
expect(comm).to receive(:test).with("sudo systemctl status systemd-networkd.service").and_return(true) expect(comm).to receive(:test).with("systemctl -q is-active systemd-networkd.service", anything).and_return(true)
end end
it "creates and starts the networks using systemd-networkd" do it "creates and starts the networks using systemd-networkd" do
@ -117,7 +117,7 @@ describe "VagrantPlugins::GuestDebian::Cap::ConfigureNetworks" do
context "with netplan" do context "with netplan" do
before do before do
expect(comm).to receive(:test).with("netplan -h").and_return(true) expect(comm).to receive(:test).with("command -v netplan").and_return(true)
end end
let(:nm_yml) { "---\nnetwork:\n version: 2\n renderer: NetworkManager\n ethernets:\n eth1:\n dhcp4: true\n eth2:\n addresses:\n - 33.33.33.10/16\n gateway4: 33.33.0.1\n" } let(:nm_yml) { "---\nnetwork:\n version: 2\n renderer: NetworkManager\n ethernets:\n eth1:\n dhcp4: true\n eth2:\n addresses:\n - 33.33.33.10/16\n gateway4: 33.33.0.1\n" }