From 6fc2f4661a096422c622d22b1fe686e22989d50b Mon Sep 17 00:00:00 2001 From: Mitchell Hashimoto Date: Sun, 30 May 2010 17:56:20 -0700 Subject: [PATCH] 1 second sleep after the halt on `down` to allow VirtualBox to clean itself up --- lib/vagrant/actions/vm/down.rb | 4 ++-- test/vagrant/actions/vm/down_test.rb | 9 +-------- vagrant.gemspec | 2 +- 3 files changed, 4 insertions(+), 11 deletions(-) diff --git a/lib/vagrant/actions/vm/down.rb b/lib/vagrant/actions/vm/down.rb index 2092180c7..e90e63a4e 100644 --- a/lib/vagrant/actions/vm/down.rb +++ b/lib/vagrant/actions/vm/down.rb @@ -10,10 +10,10 @@ module Vagrant end def after_halt - # This sleep is necessary to wait for the GUI to clean itself up. + # This sleep is necessary to wait for the VM to clean itself up. # There appears to be nothing in the API that does this "wait" # for us. - Kernel.sleep(1) if @runner.env.config.vm.boot_mode == "gui" + Kernel.sleep(1) end end end diff --git a/test/vagrant/actions/vm/down_test.rb b/test/vagrant/actions/vm/down_test.rb index ffde492a8..79019f48b 100644 --- a/test/vagrant/actions/vm/down_test.rb +++ b/test/vagrant/actions/vm/down_test.rb @@ -31,16 +31,9 @@ class DownActionTest < Test::Unit::TestCase end context "after halting" do - should "sleep if boot mode is GUI" do - @runner.env.config.vm.boot_mode = "gui" + should "sleep" do Kernel.expects(:sleep).once @action.after_halt end - - should "not sleep if boot mode is anything else" do - @runner.env.config.vm.boot_mode = "vrdp" - Kernel.expects(:sleep).never - @action.after_halt - end end end diff --git a/vagrant.gemspec b/vagrant.gemspec index e411ece35..1c9b8bb7f 100644 --- a/vagrant.gemspec +++ b/vagrant.gemspec @@ -9,7 +9,7 @@ Gem::Specification.new do |s| s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version= s.authors = ["Mitchell Hashimoto", "John Bender"] - s.date = %q{2010-05-29} + s.date = %q{2010-05-30} s.default_executable = %q{vagrant} s.description = %q{Vagrant is a tool for building and distributing virtualized development environments.} s.email = ["mitchell.hashimoto@gmail.com", "john.m.bender@gmail.com"]