Signed-off-by: James Turnbull <[email protected]>
---
Local-branch: tickets/master/6611
 spec/unit/virtual_spec.rb |   23 ++++++++++++-----------
 1 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/spec/unit/virtual_spec.rb b/spec/unit/virtual_spec.rb
index a152b40..454a57b 100644
--- a/spec/unit/virtual_spec.rb
+++ b/spec/unit/virtual_spec.rb
@@ -6,9 +6,18 @@ require 'facter/util/macosx'
 
 describe "Virtual fact" do
 
-    after do
-        Facter.clear
-    end
+  before do
+      Facter::Util::Virtual.stubs(:zone?).returns(false)
+      Facter::Util::Virtual.stubs(:openvz?).returns(false)
+      Facter::Util::Virtual.stubs(:vserver?).returns(false)
+      Facter::Util::Virtual.stubs(:xen?).returns(false)
+      Facter::Util::Virtual.stubs(:kvm?).returns(false)
+      Facter::Util::Virtual.stubs(:hpvm?).returns(false)
+  end
+
+  after do
+      Facter.clear
+  end
 
   it "should be zone on Solaris when a zone" do
       Facter.fact(:kernel).stubs(:value).returns("SunOS")
@@ -58,13 +67,6 @@ describe "Virtual fact" do
   end
 
   describe "on Linux" do
-      before do
-          Facter::Util::Virtual.stubs(:zone?).returns(false)
-          Facter::Util::Virtual.stubs(:openvz?).returns(false)
-          Facter::Util::Virtual.stubs(:vserver?).returns(false)
-          Facter::Util::Virtual.stubs(:xen?).returns(false)
-          Facter::Util::Virtual.stubs(:kvm?).returns(false)
-      end
 
       it "should be parallels with Parallels vendor id from lspci" do
           Facter.fact(:kernel).stubs(:value).returns("Linux")
@@ -114,7 +116,6 @@ describe "Virtual fact" do
           Facter.fact(:virtual).value.should == "parallels"
       end
   end
-
 end
 
 describe "is_virtual fact" do
-- 
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 [email protected].
To unsubscribe from this group, send email to 
[email protected].
For more options, visit this group at 
http://groups.google.com/group/puppet-dev?hl=en.

Reply via email to