[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, master, updated. debian/0.24.6-1-356-g5718585

[James Turnbull]

The following commit has been merged in the master branch:
commit 091b8bf11c83ed31f85d859e6c97730ea5e4905a
Author: Luke Kanies <luke at madstop.com>
Date:   Mon Dec 1 12:40:01 2008 -0600

    Fixing #1785 - selinux tests no longer break other tests
    
    Signed-off-by: Luke Kanies <luke at madstop.com>

diff --git a/spec/unit/util/selinux.rb b/spec/unit/util/selinux.rb
index 763dd3b..dacf9f5 100644
--- a/spec/unit/util/selinux.rb
+++ b/spec/unit/util/selinux.rb
@@ -5,15 +5,19 @@ require File.dirname(__FILE__) + '/../../spec_helper'
 require 'puppet/util/selinux'
 include Puppet::Util::SELinux
 
+unless defined?(Selinux)
+    module Selinux
+        def self.is_selinux_enabled
+            false
+        end
+    end
+end
+
 describe Puppet::Util::SELinux do
 
     describe "selinux_support?" do
-        before :all do
-            if not defined? Selinux
-                Selinux = mock()
-            end
+        before do
         end
-
         it "should return :true if this system has SELinux enabled" do
              Selinux.expects(:is_selinux_enabled).returns 1
              selinux_support?.should be_true

-- 
Puppet packaging for Debian