Merge branch 'master' of git://reductivelabs.com/puppet

2 files changed, 8 insertions, 1 deletions

diff --git a/test/network/client/master.rb b/test/network/client/master.rb
index 169a1de5f..0a3b75b91 100755
--- a/test/network/client/master.rb
+++ b/test/network/client/master.rb
@@ -379,7 +379,7 @@ end
             facts = Puppet::Network::Client.master.facts
         end
         Facter.to_hash.each do |fact, value|
-            assert_equal(facts[fact.downcase], value, "%s is not equal" % fact.inspect)
+            assert_equal(facts[fact.downcase], value.to_s, "%s is not equal" % fact.inspect)
         end
         
         # Make sure the puppet version got added
diff --git a/test/network/xmlrpc/webrick_servlet.rb b/test/network/xmlrpc/webrick_servlet.rb
index ce31d9dbe..e7a6af171 100755
--- a/test/network/xmlrpc/webrick_servlet.rb
+++ b/test/network/xmlrpc/webrick_servlet.rb
@@ -3,11 +3,18 @@
 $:.unshift("../../lib") if __FILE__ =~ /\.rb$/
 
 require 'puppettest'
+require 'puppettest/support/utils'
 require 'puppet/network/xmlrpc/webrick_servlet'
 require 'mocha'
 
 class TestXMLRPCWEBrickServlet < Test::Unit::TestCase
+    include PuppetTest
     def test_basics
+	# Make sure we're doing things as our user info, rather than puppet/puppet
+	setme
+	set_mygroup
+	Puppet[:user] = @me
+	Puppet[:group] = @mygroup
         servlet = nil
         ca = Puppet::Network::Handler.ca.new