Changing the test/ classes so that they work from the main

test/ dir or from their own working dir, like the specs do.
This was just a question of changing how their libraries
are loaded.

26 files changed, 26 insertions, 26 deletions

diff --git a/test/network/authconfig.rb b/test/network/authconfig.rb
index e22431c75..3a05096d5 100755
--- a/test/network/authconfig.rb
+++ b/test/network/authconfig.rb
@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-$:.unshift("../lib") if __FILE__ =~ /\.rb$/
+require File.dirname(__FILE__) + '/../lib/puppettest'
 
 require 'puppettest'
 
diff --git a/test/network/authorization.rb b/test/network/authorization.rb
index 766c454e0..23ec8f95c 100755
--- a/test/network/authorization.rb
+++ b/test/network/authorization.rb
@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-$:.unshift("../lib") if __FILE__ =~ /\.rb$/
+require File.dirname(__FILE__) + '/../lib/puppettest'
 
 require 'puppettest'
 require 'puppet/network/authorization'
diff --git a/test/network/authstore.rb b/test/network/authstore.rb
index 6d2bc08e2..ad4a4f1c2 100755
--- a/test/network/authstore.rb
+++ b/test/network/authstore.rb
@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-$:.unshift("../lib") if __FILE__ =~ /\.rb$/
+require File.dirname(__FILE__) + '/../lib/puppettest'
 
 require 'puppettest'
 require 'mocha'
diff --git a/test/network/client/ca.rb b/test/network/client/ca.rb
index c996e1abd..74de37900 100755
--- a/test/network/client/ca.rb
+++ b/test/network/client/ca.rb
@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-$:.unshift("../../lib") if __FILE__ =~ /\.rb$/
+require File.dirname(__FILE__) + '/../../lib/puppettest'
 
 require 'mocha'
 require 'puppettest'
diff --git a/test/network/client/client.rb b/test/network/client/client.rb
index a297a87e1..4a7e9cdb6 100755
--- a/test/network/client/client.rb
+++ b/test/network/client/client.rb
@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-$:.unshift("../../lib") if __FILE__ =~ /\.rb$/
+require File.dirname(__FILE__) + '/../../lib/puppettest'
 
 require 'puppettest'
 require 'mocha'
diff --git a/test/network/client/dipper.rb b/test/network/client/dipper.rb
index d48b50478..51494be9d 100755
--- a/test/network/client/dipper.rb
+++ b/test/network/client/dipper.rb
@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-$:.unshift("../../lib") if __FILE__ =~ /\.rb$/
+require File.dirname(__FILE__) + '/../../lib/puppettest'
 
 require 'puppettest'
 require 'puppet/network/client/resource'
diff --git a/test/network/client/master.rb b/test/network/client/master.rb
index 4ae77abc2..4f6956470 100755
--- a/test/network/client/master.rb
+++ b/test/network/client/master.rb
@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-$:.unshift("../../lib") if __FILE__ =~ /\.rb$/
+require File.dirname(__FILE__) + '/../../lib/puppettest'
 
 require 'puppettest'
 require 'mocha'
diff --git a/test/network/client/resource.rb b/test/network/client/resource.rb
index 2b034f079..83c195035 100755
--- a/test/network/client/resource.rb
+++ b/test/network/client/resource.rb
@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-$:.unshift("../../lib") if __FILE__ =~ /\.rb$/
+require File.dirname(__FILE__) + '/../../lib/puppettest'
 
 require 'puppettest'
 require 'puppet/network/client/resource'
diff --git a/test/network/client_request.rb b/test/network/client_request.rb
index f7804ec07..7408e2b87 100755
--- a/test/network/client_request.rb
+++ b/test/network/client_request.rb
@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-$:.unshift("../lib") if __FILE__ =~ /\.rb$/
+require File.dirname(__FILE__) + '/../lib/puppettest'
 
 require 'puppettest'
 
diff --git a/test/network/daemon.rb b/test/network/daemon.rb
index e794ce241..5105c6e4c 100755
--- a/test/network/daemon.rb
+++ b/test/network/daemon.rb
@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-$:.unshift("../lib") if __FILE__ =~ /\.rb$/
+require File.dirname(__FILE__) + '/../lib/puppettest'
 
 require 'puppettest'
 require 'puppet/daemon'
diff --git a/test/network/handler/bucket.rb b/test/network/handler/bucket.rb
index 30a192f09..6b28fdb72 100755
--- a/test/network/handler/bucket.rb
+++ b/test/network/handler/bucket.rb
@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-$:.unshift("../../lib") if __FILE__ =~ /\.rb$/
+require File.dirname(__FILE__) + '/../../lib/puppettest'
 
 require 'puppettest'
 require 'puppet/network/handler/filebucket'
diff --git a/test/network/handler/ca.rb b/test/network/handler/ca.rb
index e349f9c4c..16782bb18 100755
--- a/test/network/handler/ca.rb
+++ b/test/network/handler/ca.rb
@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-$:.unshift("../../lib") if __FILE__ =~ /\.rb$/
+require File.dirname(__FILE__) + '/../../lib/puppettest'
 
 require 'puppettest'
 require 'puppet/network/handler/ca'
diff --git a/test/network/handler/configuration.rb b/test/network/handler/configuration.rb
index 1c08fd196..e560bd624 100755
--- a/test/network/handler/configuration.rb
+++ b/test/network/handler/configuration.rb
@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-$:.unshift("../../lib") if __FILE__ =~ /\.rb$/
+require File.dirname(__FILE__) + '/../../lib/puppettest'
 
 require 'puppettest'
 require 'puppet/network/handler/configuration'
diff --git a/test/network/handler/fileserver.rb b/test/network/handler/fileserver.rb
index 8dcbf63ea..3539169dc 100755
--- a/test/network/handler/fileserver.rb
+++ b/test/network/handler/fileserver.rb
@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-$:.unshift("../../lib") if __FILE__ =~ /\.rb$/
+require File.dirname(__FILE__) + '/../../lib/puppettest'
 
 require 'puppettest'
 require 'puppet/network/handler/fileserver'
diff --git a/test/network/handler/handler.rb b/test/network/handler/handler.rb
index b812ca3d3..f108ef98d 100755
--- a/test/network/handler/handler.rb
+++ b/test/network/handler/handler.rb
@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-$:.unshift("../../lib") if __FILE__ =~ /\.rb$/
+require File.dirname(__FILE__) + '/../../lib/puppettest'
 
 require 'puppettest'
 require 'puppet/network/handler'
diff --git a/test/network/handler/master.rb b/test/network/handler/master.rb
index 6c4451d06..694888f4d 100755
--- a/test/network/handler/master.rb
+++ b/test/network/handler/master.rb
@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-$:.unshift("../../lib") if __FILE__ =~ /\.rb$/
+require File.dirname(__FILE__) + '/../../lib/puppettest'
 
 require 'puppettest'
 require 'puppet/network/handler/master'
diff --git a/test/network/handler/report.rb b/test/network/handler/report.rb
index 76326bce6..8719c68b5 100755
--- a/test/network/handler/report.rb
+++ b/test/network/handler/report.rb
@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-$:.unshift("../../lib") if __FILE__ =~ /\.rb$/
+require File.dirname(__FILE__) + '/../../lib/puppettest'
 
 require 'puppettest'
 require 'puppet/network/handler/report'
diff --git a/test/network/handler/resource.rb b/test/network/handler/resource.rb
index b2acc00b9..0d6373160 100755
--- a/test/network/handler/resource.rb
+++ b/test/network/handler/resource.rb
@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-$:.unshift("../../lib") if __FILE__ =~ /\.rb$/
+require File.dirname(__FILE__) + '/../../lib/puppettest'
 
 require 'puppettest'
 require 'base64'
diff --git a/test/network/handler/runner.rb b/test/network/handler/runner.rb
index 50a00862a..402b27ffc 100755
--- a/test/network/handler/runner.rb
+++ b/test/network/handler/runner.rb
@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-$:.unshift("../../lib") if __FILE__ =~ /\.rb$/
+require File.dirname(__FILE__) + '/../../lib/puppettest'
 
 require 'puppettest'
 
diff --git a/test/network/rights.rb b/test/network/rights.rb
index a3e780330..e1d9f8a0a 100755
--- a/test/network/rights.rb
+++ b/test/network/rights.rb
@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-$:.unshift("../lib") if __FILE__ =~ /\.rb$/
+require File.dirname(__FILE__) + '/../lib/puppettest'
 
 require 'puppettest'
 require 'puppet/network/rights'
diff --git a/test/network/server/mongrel_test.rb b/test/network/server/mongrel_test.rb
index 52d8790eb..80e9aa454 100755
--- a/test/network/server/mongrel_test.rb
+++ b/test/network/server/mongrel_test.rb
@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-$:.unshift("../../lib") if __FILE__ =~ /\.rb$/
+require File.dirname(__FILE__) + '/../../lib/puppettest'
 
 require 'puppettest'
 require 'mocha'
diff --git a/test/network/server/webrick.rb b/test/network/server/webrick.rb
index 5919461ed..17263817b 100755
--- a/test/network/server/webrick.rb
+++ b/test/network/server/webrick.rb
@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-$:.unshift("../../lib") if __FILE__ =~ /\.rb$/
+require File.dirname(__FILE__) + '/../../lib/puppettest'
 
 require 'puppettest'
 require 'puppet/network/http_server/webrick'
diff --git a/test/network/xmlrpc/client.rb b/test/network/xmlrpc/client.rb
index a81e95a86..e740e57b4 100755
--- a/test/network/xmlrpc/client.rb
+++ b/test/network/xmlrpc/client.rb
@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-$:.unshift("../../lib") if __FILE__ =~ /\.rb$/
+require File.dirname(__FILE__) + '/../../lib/puppettest'
 
 require 'puppettest'
 require 'puppet/network/xmlrpc/client'
diff --git a/test/network/xmlrpc/processor.rb b/test/network/xmlrpc/processor.rb
index bc29f4c23..079194efa 100755
--- a/test/network/xmlrpc/processor.rb
+++ b/test/network/xmlrpc/processor.rb
@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-$:.unshift("../../lib") if __FILE__ =~ /\.rb$/
+require File.dirname(__FILE__) + '/../../lib/puppettest'
 
 require 'puppettest'
 require 'puppet/network/xmlrpc/processor'
diff --git a/test/network/xmlrpc/server.rb b/test/network/xmlrpc/server.rb
index ff9f72e0c..ae9f17ddf 100755
--- a/test/network/xmlrpc/server.rb
+++ b/test/network/xmlrpc/server.rb
@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-$:.unshift("../../lib") if __FILE__ =~ /\.rb$/
+require File.dirname(__FILE__) + '/../../lib/puppettest'
 
 require 'puppettest'
 require 'puppet/network/xmlrpc/server'
diff --git a/test/network/xmlrpc/webrick_servlet.rb b/test/network/xmlrpc/webrick_servlet.rb
index 154cc6cf9..74326f6a0 100755
--- a/test/network/xmlrpc/webrick_servlet.rb
+++ b/test/network/xmlrpc/webrick_servlet.rb
@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-$:.unshift("../../lib") if __FILE__ =~ /\.rb$/
+require File.dirname(__FILE__) + '/../../lib/puppettest'
 
 require 'puppettest'
 require 'puppettest/support/utils'