Refactor SUIDManager tests to run without root, change SUIDManager's behavior to not silently fail when it's not root and fix all other tests that broke as a result.

git-svn-id: https://reductivelabs.com/svn/puppet/trunk@2759 980ebf18-57e1-0310-9a29-db15c13687c0

7 files changed, 26 insertions, 0 deletions

diff --git a/test/network/client/ca.rb b/test/network/client/ca.rb
index 26fb72f40..00ed7413a 100755
--- a/test/network/client/ca.rb
+++ b/test/network/client/ca.rb
@@ -11,6 +11,7 @@ class TestClientCA < Test::Unit::TestCase
     include PuppetTest::ServerTest
 
     def setup
+        Puppet::Util::SUIDManager.stubs(:asuser).yields
         super
         @ca = Puppet::Network::Handler.ca.new
         @client = Puppet::Network::Client.ca.new :CA => @ca
diff --git a/test/network/client/client.rb b/test/network/client/client.rb
index 534518fe6..14c90f2a9 100755
--- a/test/network/client/client.rb
+++ b/test/network/client/client.rb
@@ -230,6 +230,8 @@ class TestClient < Test::Unit::TestCase
 
     # Make sure that reading the cert in also sets up the cert stuff for the driver
     def test_read_cert
+        Puppet::Util::SUIDManager.stubs(:asuser).yields
+
         ca = Puppet::Network::Handler.ca.new
         caclient = Puppet::Network::Client.ca.new :CA => ca
 
diff --git a/test/network/handler/bucket.rb b/test/network/handler/bucket.rb
index eb488dd33..65badc9eb 100755
--- a/test/network/handler/bucket.rb
+++ b/test/network/handler/bucket.rb
@@ -5,6 +5,7 @@ $:.unshift("../../lib") if __FILE__ =~ /\.rb$/
 require 'puppettest'
 require 'puppet/network/handler/filebucket'
 require 'base64'
+require 'mocha'
 
 class TestBucket < Test::Unit::TestCase
     include PuppetTest::ServerTest
@@ -204,6 +205,8 @@ class TestBucket < Test::Unit::TestCase
 
     # test that things work over the wire
     def test_webxmlmix
+        Puppet::Util::SUIDManager.stubs(:asuser).yields
+
         files = filelist()
 
         tmpdir = File.join(tmpdir(),"tmpfiledir")
diff --git a/test/network/handler/ca.rb b/test/network/handler/ca.rb
index 3c89f597b..f503d7c7a 100755
--- a/test/network/handler/ca.rb
+++ b/test/network/handler/ca.rb
@@ -4,6 +4,7 @@ $:.unshift("../../lib") if __FILE__ =~ /\.rb$/
 
 require 'puppettest'
 require 'puppet/network/handler/ca'
+require 'mocha'
 
 if ARGV.length > 0 and ARGV[0] == "short"
     $short = true
@@ -13,6 +14,12 @@ end
 
 class TestCA < Test::Unit::TestCase
     include PuppetTest::ServerTest
+
+    def setup
+        Puppet::Util::SUIDManager.stubs(:asuser).yields
+        super
+    end
+
     # Verify that we're autosigning.  We have to autosign a "different" machine,
     # since we always autosign the CA server's certificate.
     def test_autocertgeneration
diff --git a/test/network/server/webrick.rb b/test/network/server/webrick.rb
index 3404a5089..69f23f3c2 100755
--- a/test/network/server/webrick.rb
+++ b/test/network/server/webrick.rb
@@ -4,10 +4,16 @@ $:.unshift("../../lib") if __FILE__ =~ /\.rb$/
 
 require 'puppettest'
 require 'puppet/network/server/webrick'
+require 'mocha'
 
 class TestWebrickServer < Test::Unit::TestCase
     include PuppetTest::ServerTest
 
+    def setup
+        Puppet::Util::SUIDManager.stubs(:asuser).yields
+        super
+    end
+
     # Make sure we can create a server, and that it knows how to create its
     # certs by default.
     def test_basics
diff --git a/test/network/xmlrpc/client.rb b/test/network/xmlrpc/client.rb
index 2dec2c030..f3c6d2388 100755
--- a/test/network/xmlrpc/client.rb
+++ b/test/network/xmlrpc/client.rb
@@ -8,6 +8,12 @@ require 'mocha'
 
 class TestXMLRPCClient < Test::Unit::TestCase
     include PuppetTest
+
+    def setup
+        Puppet::Util::SUIDManager.stubs(:asuser).yields
+        super
+    end
+
     def test_set_backtrace
         error = Puppet::Network::XMLRPCClientError.new("An error")
         assert_nothing_raised do
diff --git a/test/network/xmlrpc/processor.rb b/test/network/xmlrpc/processor.rb
index 02f0fbd2c..97cc2a774 100755
--- a/test/network/xmlrpc/processor.rb
+++ b/test/network/xmlrpc/processor.rb
@@ -26,6 +26,7 @@ class TestXMLRPCProcessor < Test::Unit::TestCase
 
     def setup
         super
+        Puppet::Util::SUIDManager.stubs(:asuser).yields
         @processor = Processor.new
     end