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

2 files changed, 6 insertions, 6 deletions

diff --git a/test/other/puppet.rb b/test/other/puppet.rb
index 885083a2b..c71b20bbc 100755
--- a/test/other/puppet.rb
+++ b/test/other/puppet.rb
@@ -11,7 +11,7 @@ class TestPuppetModule < Test::Unit::TestCase
     include SignalObserver
     
     def mkfakeclient
-        Class.new(Puppet::Client) do
+        Class.new(Puppet::Network::Client) do
             def initialize
             end
 
diff --git a/test/other/report.rb b/test/other/report.rb
index 8bd896d9a..62bda813c 100755
--- a/test/other/report.rb
+++ b/test/other/report.rb
@@ -74,7 +74,7 @@ class TestReports < Test::Unit::TestCase
         }
 
         assert_nothing_raised do
-            report.extend(Puppet::Server::Report.report(:store))
+            report.extend(Puppet::Network::Server::Report.report(:store))
         end
 
         yaml = YAML.dump(report)
@@ -119,7 +119,7 @@ class TestReports < Test::Unit::TestCase
         report = trans.report
 
         assert_nothing_raised do
-            report.extend(Puppet::Server::Report.report(:rrdgraph))
+            report.extend(Puppet::Network::Server::Report.report(:rrdgraph))
         end
 
         assert_nothing_raised {
@@ -154,7 +154,7 @@ class TestReports < Test::Unit::TestCase
     
     def test_tagmail_parsing
         report = Object.new
-        report.extend(Puppet::Server::Report.report(:tagmail))
+        report.extend(Puppet::Network::Server::Report.report(:tagmail))
         
         passers = File.join(datadir, "reports", "tagmail_passers.conf")
         assert(FileTest.exists?(passers), "no passers file %s" % passers)
@@ -178,7 +178,7 @@ class TestReports < Test::Unit::TestCase
     
     def test_tagmail_parsing_results
         report = Object.new
-        report.extend(Puppet::Server::Report.report(:tagmail))
+        report.extend(Puppet::Network::Server::Report.report(:tagmail))
         # Now test a few specific lines to make sure we get the results we want
         {
             "tag: abuse@domain.com" => [%w{abuse@domain.com}, %w{tag}, []],
@@ -206,7 +206,7 @@ class TestReports < Test::Unit::TestCase
         
         list = report.logs.collect { |l| l.to_report }
         
-        report.extend(Puppet::Server::Report.report(:tagmail))
+        report.extend(Puppet::Network::Server::Report.report(:tagmail))
         
         {
             [%w{abuse@domain.com}, %w{all}, []] => list,