Signed-off-by: James Turnbull <ja...@lovedthanlost.net>
---
Local-branch: tickets/master/6616
lib/facter/virtual.rb | 2 +-
spec/unit/virtual_spec.rb | 4 ++++
2 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/lib/facter/virtual.rb b/lib/facter/virtual.rb
index 47c9504..cf84f75 100644
--- a/lib/facter/virtual.rb
+++ b/lib/facter/virtual.rb
@@ -92,7 +92,7 @@ Facter.add("virtual") do
end
end
end
- # VMware server 1.0.3 rpm places vmware-vmx in this place, other
versions or platforms may not.
+
if FileTest.exists?("/usr/lib/vmware/bin/vmware-vmx")
result = "vmware_server"
end
diff --git a/spec/unit/virtual_spec.rb b/spec/unit/virtual_spec.rb
index 5f63dab..c1bc3cb 100644
--- a/spec/unit/virtual_spec.rb
+++ b/spec/unit/virtual_spec.rb
@@ -64,6 +64,10 @@ describe "Virtual fact" do
describe "on Linux" do
+ before do
+
FileTest.expects(:exists?).with("/usr/lib/vmware/bin/vmware-vmx").returns false
+ end
+
it "should be parallels with Parallels vendor id from lspci" do
Facter.fact(:kernel).stubs(:value).returns("Linux")
Facter::Util::Resolution.stubs(:exec).with('lspci').returns("01:00.0
VGA compatible controller: Unknown device 1ab8:4005")
--
1.7.1
--
You received this message because you are subscribed to the Google Groups
"Puppet Developers" group.
To post to this group, send email to puppet-dev@googlegroups.com.
To unsubscribe from this group, send email to
puppet-dev+unsubscr...@googlegroups.com.
For more options, visit this group at
http://groups.google.com/group/puppet-dev?hl=en.
