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.

17 files changed, 17 insertions, 17 deletions

diff --git a/test/util/autoload.rb b/test/util/autoload.rb
index ca77572c2..6babed774 100755
--- a/test/util/autoload.rb
+++ b/test/util/autoload.rb
@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-$:.unshift("../lib").unshift("../../lib") if __FILE__ =~ /\.rb$/
+require File.dirname(__FILE__) + '/../lib/puppettest'
 
 require 'puppet'
 require 'puppet/util/autoload'
diff --git a/test/util/classgen.rb b/test/util/classgen.rb
index 0ecb61f56..24908069d 100755
--- a/test/util/classgen.rb
+++ b/test/util/classgen.rb
@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-$:.unshift("../lib").unshift("../../lib") if __FILE__ =~ /\.rb$/
+require File.dirname(__FILE__) + '/../lib/puppettest'
 
 require 'puppet'
 require 'puppettest'
diff --git a/test/util/execution.rb b/test/util/execution.rb
index ce748c75a..be85d6502 100755
--- a/test/util/execution.rb
+++ b/test/util/execution.rb
@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-$:.unshift("../lib").unshift("../../lib") if __FILE__ =~ /\.rb$/
+require File.dirname(__FILE__) + '/../lib/puppettest'
 
 require 'puppet'
 require 'puppettest'
diff --git a/test/util/features.rb b/test/util/features.rb
index 1e5858877..e20c73c65 100755
--- a/test/util/features.rb
+++ b/test/util/features.rb
@@ -3,7 +3,7 @@
 #  Created by Luke Kanies on 2006-11-07.
 #  Copyright (c) 2006. All rights reserved.
 
-$:.unshift("../lib").unshift("../../lib") if __FILE__ =~ /\.rb$/
+require File.dirname(__FILE__) + '/../lib/puppettest'
 
 require 'puppettest'
 require 'puppet/util/feature'
diff --git a/test/util/fileparsing.rb b/test/util/fileparsing.rb
index e1a5d39b5..adccfab65 100755
--- a/test/util/fileparsing.rb
+++ b/test/util/fileparsing.rb
@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-$:.unshift("../lib").unshift("../../lib") if __FILE__ =~ /\.rb$/
+require File.dirname(__FILE__) + '/../lib/puppettest'
 
 require 'puppettest'
 require 'puppettest/fileparsing'
diff --git a/test/util/filetype.rb b/test/util/filetype.rb
index e98fb5f6c..6c7ede07b 100755
--- a/test/util/filetype.rb
+++ b/test/util/filetype.rb
@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-$:.unshift("../lib").unshift("../../lib") if __FILE__ =~ /\.rb$/
+require File.dirname(__FILE__) + '/../lib/puppettest'
 
 require 'puppettest'
 require 'puppet/util/filetype'
diff --git a/test/util/inifile.rb b/test/util/inifile.rb
index d27e7993c..498816b8d 100755
--- a/test/util/inifile.rb
+++ b/test/util/inifile.rb
@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-$:.unshift("../lib").unshift("../../lib") if __FILE__ =~ /\.rb$/
+require File.dirname(__FILE__) + '/../lib/puppettest'
 
 require 'puppet'
 require 'puppet/util/inifile'
diff --git a/test/util/instance_loader.rb b/test/util/instance_loader.rb
index be055fc5c..708d3f893 100755
--- a/test/util/instance_loader.rb
+++ b/test/util/instance_loader.rb
@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-$:.unshift("../lib").unshift("../../lib") if __FILE__ =~ /\.rb$/
+require File.dirname(__FILE__) + '/../lib/puppettest'
 
 require 'puppet'
 require 'puppet/util/instance_loader'
diff --git a/test/util/loadedfile.rb b/test/util/loadedfile.rb
index 801ba5b2a..fb640466a 100755
--- a/test/util/loadedfile.rb
+++ b/test/util/loadedfile.rb
@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-$:.unshift("../lib").unshift("../../lib") if __FILE__ =~ /\.rb$/
+require File.dirname(__FILE__) + '/../lib/puppettest'
 
 require 'puppet'
 require 'puppet/util/loadedfile'
diff --git a/test/util/log.rb b/test/util/log.rb
index 0e5a542db..523652f37 100755
--- a/test/util/log.rb
+++ b/test/util/log.rb
@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-$:.unshift("../lib").unshift("../../lib") if __FILE__ =~ /\.rb$/
+require File.dirname(__FILE__) + '/../lib/puppettest'
 
 require 'puppet'
 require 'puppet/util/log'
diff --git a/test/util/metrics.rb b/test/util/metrics.rb
index 2775b3ff1..b0ac1e2f5 100755
--- a/test/util/metrics.rb
+++ b/test/util/metrics.rb
@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-$:.unshift("../lib").unshift("../../lib") if __FILE__ =~ /\.rb$/
+require File.dirname(__FILE__) + '/../lib/puppettest'
 
 require 'puppet'
 require 'puppet/util/metric'
diff --git a/test/util/package.rb b/test/util/package.rb
index 737d8e5b4..8d4fbc8e8 100755
--- a/test/util/package.rb
+++ b/test/util/package.rb
@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-$:.unshift("../lib").unshift("../../lib") if __FILE__ =~ /\.rb$/
+require File.dirname(__FILE__) + '/../lib/puppettest'
 
 require 'puppet'
 require 'puppet/util/package'
diff --git a/test/util/posixtest.rb b/test/util/posixtest.rb
index ae32c7a3f..34d68e3a2 100755
--- a/test/util/posixtest.rb
+++ b/test/util/posixtest.rb
@@ -3,7 +3,7 @@
 #  Created by Luke Kanies on 2006-11-07.
 #  Copyright (c) 2006. All rights reserved.
 
-$:.unshift("../lib").unshift("../../lib") if __FILE__ =~ /\.rb$/
+require File.dirname(__FILE__) + '/../lib/puppettest'
 
 require 'puppettest'
 require 'puppet/util/posix'
diff --git a/test/util/settings.rb b/test/util/settings.rb
index 7dad04968..cf5dca76d 100755
--- a/test/util/settings.rb
+++ b/test/util/settings.rb
@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-$:.unshift("../lib").unshift("../../lib") if __FILE__ =~ /\.rb$/
+require File.dirname(__FILE__) + '/../lib/puppettest'
 
 require 'mocha'
 require 'puppettest'
diff --git a/test/util/storage.rb b/test/util/storage.rb
index d583e2c59..5634a94f6 100755
--- a/test/util/storage.rb
+++ b/test/util/storage.rb
@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-$:.unshift("../lib").unshift("../../lib") if __FILE__ =~ /\.rb$/
+require File.dirname(__FILE__) + '/../lib/puppettest'
 
 require 'puppet'
 require 'puppettest'
diff --git a/test/util/subclass_loader.rb b/test/util/subclass_loader.rb
index 2066785f7..34b8803fc 100755
--- a/test/util/subclass_loader.rb
+++ b/test/util/subclass_loader.rb
@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-$:.unshift("../lib") if __FILE__ =~ /\.rb$/
+require File.dirname(__FILE__) + '/../lib/puppettest'
 
 require 'puppettest'
 require 'puppet/util/subclass_loader'
diff --git a/test/util/utiltest.rb b/test/util/utiltest.rb
index 13a17ed6c..35e1446a1 100755
--- a/test/util/utiltest.rb
+++ b/test/util/utiltest.rb
@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-$:.unshift("../lib").unshift("../../lib") if __FILE__ =~ /\.rb$/
+require File.dirname(__FILE__) + '/../lib/puppettest'
 
 require 'puppettest'
 require 'mocha'