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

Merge pull request #8073 from bshurts/fix/issue-7983 

HyperV inaccurate winrm address - issue-7983
This commit is contained in:
Chris Roberts 2017-03-06 09:11:34 -08:00 committed by GitHub
parent 11cbf283ba e4626d088d
commit 6631fbdb9b
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/communicators/winrm/helper.rb
View File

@ -33,7 +33,7 @@ module VagrantPlugins
return addr if addr return addr if addr
ssh_info = machine.ssh_info ssh_info = machine.ssh_info
raise Errors::WinRMNotReady if !ssh_info raise Errors::WinRMNotReady if !ssh_info || ssh_info[:host].empty?
return ssh_info[:host] return ssh_info[:host]
end end

6
test/unit/plugins/communicators/winrm/helper_test.rb
View File

@ -36,6 +36,12 @@ describe VagrantPlugins::CommunicatorWinRM::Helper do
expect { subject.winrm_address(machine) }. expect { subject.winrm_address(machine) }.
to raise_error(VagrantPlugins::CommunicatorWinRM::Errors::WinRMNotReady) to raise_error(VagrantPlugins::CommunicatorWinRM::Errors::WinRMNotReady)
end end
it "raise an exception if it detects an empty host ip" do
machine.stub(ssh_info: { host: "" })
expect { subject.winrm_address(machine) }.
to raise_error(VagrantPlugins::CommunicatorWinRM::Errors::WinRMNotReady)
end
end end
describe ".winrm_info" do describe ".winrm_info" do