Moving all of the client and server code into a single network/ directory. In other words, more code structure cleanup.

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

1 files changed, 4 insertions, 5 deletions

diff --git a/test/server/runner.rb b/test/server/runner.rb
index e102250fe..9d4cf41be 100755
--- a/test/server/runner.rb
+++ b/test/server/runner.rb
@@ -2,8 +2,7 @@
 
 $:.unshift("../lib").unshift("../../lib") if __FILE__ =~ /\.rb$/
 
-require 'puppet'
-require 'puppet/server/runner'
+require 'puppet/network/server/runner'
 require 'puppettest'
 
 class TestServerRunner < Test::Unit::TestCase
@@ -15,7 +14,7 @@ class TestServerRunner < Test::Unit::TestCase
         # create our master
         assert_nothing_raised() {
             # this is the default server setup
-            master = Puppet::Server::Master.new(
+            master = Puppet::Network::Server::Master.new(
                 :Manifest => file,
                 :UseNodes => false,
                 :Local => true
@@ -24,7 +23,7 @@ class TestServerRunner < Test::Unit::TestCase
 
         # and our client
         assert_nothing_raised() {
-            client = Puppet::Client::MasterClient.new(
+            client = Puppet::Network::Client::MasterClient.new(
                 :Master => master
             )
         }
@@ -52,7 +51,7 @@ class TestServerRunner < Test::Unit::TestCase
 
         runner = nil
         assert_nothing_raised {
-            runner = Puppet::Server::Runner.new
+            runner = Puppet::Network::Server::Runner.new
         }
         # First: tags
         # Second: ignore schedules true/false