Committing most of the scheduling stuff. There is still a bit of work to do in terms of how puppetd interacts with scheduling, but the bulk of the work is done.

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

1 files changed, 2 insertions, 2 deletions

diff --git a/test/client/client.rb b/test/client/client.rb
index 608fa1dc6..3a462c097 100644
--- a/test/client/client.rb
+++ b/test/client/client.rb
@@ -114,11 +114,11 @@ class TestClient < Test::Unit::TestCase
 
         # now verify that our client cannot do non-cert operations
         # because its certs are signed by a different CA
-        assert_raise(Puppet::NetworkClientError,
+        assert_raise(Puppet::Error,
             "Client was allowed to call getconfig with no certs") {
             nonemaster.getconfig
         }
-        assert_raise(Puppet::NetworkClientError,
+        assert_raise(Puppet::Error,
             "Client was allowed to call getconfig with untrusted certs") {
             certmaster.getconfig
         }