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

Tests passing for GH-602

This commit is contained in:
Mitchell Hashimoto 2011-12-25 09:57:20 -08:00
parent e870d1b29e
commit 4e547becab
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
test/acceptance/port_forward_test.rb
View File

@ -92,7 +92,7 @@ VFILE
it "refuses to resume if there is a port collision" do it "refuses to resume if there is a port collision" do
# The two environments need to share a VBOX_USER_HOME so that the # The two environments need to share a VBOX_USER_HOME so that the
# VM's go into the same place. # VM's go into the same place.
env_vars = { "VBOX_USER_HOME" => Tempdir.new("vagrant").to_s } env_vars = { "VBOX_USER_HOME" => Tempdir.new("vagrant").path }
environment = new_environment(env_vars) environment = new_environment(env_vars)
environment2 = new_environment(env_vars) environment2 = new_environment(env_vars)
@ -115,7 +115,7 @@ VFILE
# result in an error. # result in an error.
result = environment.execute("vagrant", "up") result = environment.execute("vagrant", "up")
result.should_not succeed result.should_not succeed
result.should match_output(:resume_port_collision) result.stderr.should match_output(:resume_port_collision)
ensure ensure
environment.close environment.close
environment2.close environment2.close

2
test/acceptance/support/output.rb
View File

@ -42,7 +42,7 @@ module Acceptance
end end
def resume_port_collision def resume_port_collision
@text =~ // @text =~ /^This VM cannot be resumed, because the forwarded ports/
end end
# This checks that the VM with the given `vm_name` has the # This checks that the VM with the given `vm_name` has the