summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLuke Kanies <luke@madstop.com>2008-12-01 12:40:01 -0600
committerJames Turnbull <james@lovedthanlost.net>2008-12-02 09:11:28 +1100
commit091b8bf11c83ed31f85d859e6c97730ea5e4905a (patch)
tree5cc894c37905aaef9ae95eb84c142ef82e7fc90a
parentc005dcf2748326ea0f177d7da806a0cd4241c31d (diff)
downloadpuppet-091b8bf11c83ed31f85d859e6c97730ea5e4905a.tar.gz
puppet-091b8bf11c83ed31f85d859e6c97730ea5e4905a.tar.xz
puppet-091b8bf11c83ed31f85d859e6c97730ea5e4905a.zip
Fixing #1785 - selinux tests no longer break other tests
Signed-off-by: Luke Kanies <luke@madstop.com>
-rw-r--r--spec/unit/util/selinux.rb14
1 files changed, 9 insertions, 5 deletions
diff --git a/spec/unit/util/selinux.rb b/spec/unit/util/selinux.rb
index 763dd3bf6..dacf9f503 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