b2269a63f2
Update to 2.2.5, rebase patches, fix test failures with of vagrant-libvirt, fix issues on ARM, fix dependency issues with addressable OBS-URL: https://build.opensuse.org/request/show/727276 OBS-URL: https://build.opensuse.org/package/show/Virtualization:vagrant/vagrant?expand=0&rev=34
42 lines
1.5 KiB
Diff
42 lines
1.5 KiB
Diff
From bd5d63abbba0294bea738ddb497b59703ce67fea Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= <dcermak@suse.com>
|
|
Date: Thu, 14 Mar 2019 00:25:05 +0100
|
|
Subject: [PATCH 09/15] Fix unit tests for GuestLinux::Cap::Halt
|
|
|
|
This test fails since we patch `shutdown -h now` to be `shutdown -h now &`
|
|
instead.
|
|
---
|
|
test/unit/plugins/guests/linux/cap/halt_test.rb | 6 +++---
|
|
1 file changed, 3 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/test/unit/plugins/guests/linux/cap/halt_test.rb b/test/unit/plugins/guests/linux/cap/halt_test.rb
|
|
index 81f682aa1..70d2603b9 100644
|
|
--- a/test/unit/plugins/guests/linux/cap/halt_test.rb
|
|
+++ b/test/unit/plugins/guests/linux/cap/halt_test.rb
|
|
@@ -22,19 +22,19 @@ describe "VagrantPlugins::GuestLinux::Cap::Halt" do
|
|
let(:cap) { caps.get(:halt) }
|
|
|
|
it "runs the shutdown command" do
|
|
- comm.expect_command("shutdown -h now")
|
|
+ comm.expect_command("shutdown -h now &")
|
|
cap.halt(machine)
|
|
end
|
|
|
|
it "does not raise an IOError" do
|
|
- comm.stub_command("shutdown -h now", raise: IOError)
|
|
+ comm.stub_command("shutdown -h now &", raise: IOError)
|
|
expect {
|
|
cap.halt(machine)
|
|
}.to_not raise_error
|
|
end
|
|
|
|
it "does not raise a SSHDisconnected" do
|
|
- comm.stub_command("shutdown -h now", raise: Vagrant::Errors::SSHDisconnected)
|
|
+ comm.stub_command("shutdown -h now &", raise: Vagrant::Errors::SSHDisconnected)
|
|
expect {
|
|
cap.halt(machine)
|
|
}.to_not raise_error
|
|
--
|
|
2.22.1
|
|
|