diff options
| author | Matt Robinson <matt@puppetlabs.com> | 2010-06-30 15:33:17 -0700 |
|---|---|---|
| committer | Markus Roberts <Markus@reality.com> | 2010-07-01 13:48:03 -0700 |
| commit | 62e3b611e65deab60c615eac553cac9aa7e76d9d (patch) | |
| tree | 013b9b130a3aaf973b7517b19dc6e944c0f9d688 /test/network | |
| parent | 2a2588392a2eead4265afcb93ff7bc16b5fc1ef1 (diff) | |
| download | puppet-62e3b611e65deab60c615eac553cac9aa7e76d9d.tar.gz puppet-62e3b611e65deab60c615eac553cac9aa7e76d9d.tar.xz puppet-62e3b611e65deab60c615eac553cac9aa7e76d9d.zip | |
[#4090] Fix last few tests and renames of mode to run_mode
Diffstat (limited to 'test/network')
| -rwxr-xr-x | test/network/authorization.rb | 4 | ||||
| -rwxr-xr-x | test/network/server/webrick.rb | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/test/network/authorization.rb b/test/network/authorization.rb index 9200c5824..56c537773 100755 --- a/test/network/authorization.rb +++ b/test/network/authorization.rb @@ -82,8 +82,8 @@ class TestAuthConfig < Test::Unit::TestCase assert(! @obj.authorized?(@request), "Allowed call with no config file") assert_logged(:notice, /Denying/, "did not log call") - # Now set our mode to master, so calls are allowed - Puppet.mode.stubs(:master?).returns true + # Now set our run_mode to master, so calls are allowed + Puppet::Util::RunMode.any_instance.stubs(:master?).returns true assert(@obj.authorized?(@request), "Denied call with no config file and master") assert_logged(:debug, /Allowing/, "did not log call") diff --git a/test/network/server/webrick.rb b/test/network/server/webrick.rb index 5cde2b756..99b04817c 100755 --- a/test/network/server/webrick.rb +++ b/test/network/server/webrick.rb @@ -93,7 +93,7 @@ class TestWebrickServer < Test::Unit::TestCase } pid = fork { - Puppet.mode.stubs(:master?).returns(true) + Puppet::Util::RunMode.any_instance.stubs(:master?).returns true assert_nothing_raised() { trap(:INT) { server.shutdown } server.start |