From 7fe18e3ffba0d8f206b0e7aef2dd6684a98802b6 Mon Sep 17 00:00:00 2001 From: Rick Bradley Date: Tue, 2 Oct 2007 14:41:11 -0500 Subject: Fixed a test which was secretly sneaking off and pulling certs from ~ if they were there: Added set_mygroup method, removed duplicate setme method. Included PuppetTest in the XMLRPC servlect test. --- test/network/xmlrpc/webrick_servlet.rb | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'test/network') 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 -- cgit From 1174d99acb5505b8de577b7f71cee0d32a4cf05f Mon Sep 17 00:00:00 2001 From: Rick Bradley Date: Tue, 2 Oct 2007 14:49:38 -0500 Subject: Fixed a failing test where we presumed that non-string Fact values would have type preserved across a P::N::Client.master.facts call, which is not true. --- test/network/client/master.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'test/network') 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 -- cgit