Merge branch 'next'

88 files changed, 115 insertions, 322 deletions

diff --git a/test/certmgr/certmgr.rb b/test/certmgr/certmgr.rb
index b78a138b7..11ecd6307 100755
--- a/test/certmgr/certmgr.rb
+++ b/test/certmgr/certmgr.rb
@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-require File.dirname(__FILE__) + '/../lib/puppettest'
+require File.expand_path(File.dirname(__FILE__) + '/../lib/puppettest')
 
 require 'puppet'
 require 'puppet/sslcertificates.rb'
diff --git a/test/certmgr/inventory.rb b/test/certmgr/inventory.rb
index d1ba4c879..fa612b2c1 100755
--- a/test/certmgr/inventory.rb
+++ b/test/certmgr/inventory.rb
@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-require File.dirname(__FILE__) + '/../lib/puppettest'
+require File.expand_path(File.dirname(__FILE__) + '/../lib/puppettest')
 
 require 'puppet'
 require 'puppettest/certificates'
diff --git a/test/certmgr/support.rb b/test/certmgr/support.rb
index 060c458d8..f85d54a8a 100755
--- a/test/certmgr/support.rb
+++ b/test/certmgr/support.rb
@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-require File.dirname(__FILE__) + '/../lib/puppettest'
+require File.expand_path(File.dirname(__FILE__) + '/../lib/puppettest')
 
 require 'puppettest'
 require 'puppet/sslcertificates/support'
diff --git a/test/language/ast.rb b/test/language/ast.rb
index 10b9fa361..ec20cdb99 100755
--- a/test/language/ast.rb
+++ b/test/language/ast.rb
@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-require File.dirname(__FILE__) + '/../lib/puppettest'
+require File.expand_path(File.dirname(__FILE__) + '/../lib/puppettest')
 
 require 'puppettest'
 require 'puppet/parser/parser'
diff --git a/test/language/ast/variable.rb b/test/language/ast/variable.rb
index 8a7738b23..968d1b7c3 100755
--- a/test/language/ast/variable.rb
+++ b/test/language/ast/variable.rb
@@ -3,7 +3,7 @@
 #  Created by Luke A. Kanies on 2007-0419.
 #  Copyright (c) 2006. All rights reserved.
 
-require File.dirname(__FILE__) + '/../../lib/puppettest'
+require File.expand_path(File.dirname(__FILE__) + '/../../lib/puppettest')
 
 require 'puppettest'
 require 'puppettest/parsertesting'
diff --git a/test/language/functions.rb b/test/language/functions.rb
index 081063e2b..3c27f2b2b 100755
--- a/test/language/functions.rb
+++ b/test/language/functions.rb
@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-require File.dirname(__FILE__) + '/../lib/puppettest'
+require File.expand_path(File.dirname(__FILE__) + '/../lib/puppettest')
 
 require 'puppet'
 require 'puppet/parser/parser'
diff --git a/test/language/parser.rb b/test/language/parser.rb
index 6f3d751c2..36a9c4787 100755
--- a/test/language/parser.rb
+++ b/test/language/parser.rb
@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-require File.dirname(__FILE__) + '/../lib/puppettest'
+require File.expand_path(File.dirname(__FILE__) + '/../lib/puppettest')
 
 require 'mocha'
 require 'puppet'
@@ -500,9 +500,9 @@ file { "/tmp/yayness":
   ensure
     if Puppet.features.rails?
       Puppet[:storeconfigs] = false
-      Puppet::Resource::Catalog.cache_class =  catalog_cache_class
-      Puppet::Node::Facts.cache_class = facts_cache_class
-      Puppet::Node.cache_class = node_cache_class
+      Puppet::Resource::Catalog.indirection.cache_class =  catalog_cache_class
+      Puppet::Node::Facts.indirection.cache_class = facts_cache_class
+      Puppet::Node.indirection.cache_class = node_cache_class
     end
   end
 
@@ -539,9 +539,9 @@ file { "/tmp/yayness":
   ensure
     if Puppet.features.rails?
       Puppet[:storeconfigs] = false
-      Puppet::Resource::Catalog.cache_class =  catalog_cache_class
-      Puppet::Node::Facts.cache_class = facts_cache_class
-      Puppet::Node.cache_class = node_cache_class
+      Puppet::Resource::Catalog.indirection.cache_class =  catalog_cache_class
+      Puppet::Node::Facts.indirection.cache_class = facts_cache_class
+      Puppet::Node.indirection.cache_class = node_cache_class
     end
   end
 
diff --git a/test/language/scope.rb b/test/language/scope.rb
index d9c122a92..c4154dc27 100755
--- a/test/language/scope.rb
+++ b/test/language/scope.rb
@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-require File.dirname(__FILE__) + '/../lib/puppettest'
+require File.expand_path(File.dirname(__FILE__) + '/../lib/puppettest')
 
 require 'mocha'
 require 'puppettest'
@@ -233,9 +233,9 @@ Host <<||>>"
     }
   ensure
     Puppet[:storeconfigs] = false
-    Puppet::Resource::Catalog.cache_class =  catalog_cache_class
-    Puppet::Node::Facts.cache_class = facts_cache_class
-    Puppet::Node.cache_class = node_cache_class
+    Puppet::Resource::Catalog.indirection.cache_class =  catalog_cache_class
+    Puppet::Node::Facts.indirection.cache_class = facts_cache_class
+    Puppet::Node.indirection.cache_class = node_cache_class
   end
   else
     $stderr.puts "No ActiveRecord -- skipping collection tests"
diff --git a/test/language/snippets.rb b/test/language/snippets.rb
index 51c5e23fe..bfc14fa2d 100755
--- a/test/language/snippets.rb
+++ b/test/language/snippets.rb
@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-require File.dirname(__FILE__) + '/../lib/puppettest'
+require File.expand_path(File.dirname(__FILE__) + '/../lib/puppettest')
 
 require 'puppet'
 require 'puppet/parser/parser'
@@ -37,6 +37,9 @@ class TestSnippets < Test::Unit::TestCase
   end
 
   def assert_mode_equal(mode, path)
+    if mode.is_a? Integer
+      mode = mode.to_s(8)
+    end
     unless file = @catalog.resource(:file, path)
       raise "Could not find file #{path}"
     end
@@ -501,7 +504,7 @@ class TestSnippets < Test::Unit::TestCase
 
         catalog = nil
         assert_nothing_raised("Could not compile catalog") {
-          catalog = Puppet::Resource::Catalog.find(node)
+          catalog = Puppet::Resource::Catalog.indirection.find(node)
         }
 
         assert_nothing_raised("Could not convert catalog") {
diff --git a/test/language/transportable.rb b/test/language/transportable.rb
index 1e9ae930e..d8b5c10e1 100755
--- a/test/language/transportable.rb
+++ b/test/language/transportable.rb
@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-require File.dirname(__FILE__) + '/../lib/puppettest'
+require File.expand_path(File.dirname(__FILE__) + '/../lib/puppettest')
 
 require 'puppet'
 require 'puppet/transportable'
diff --git a/test/lib/puppettest/support/utils.rb b/test/lib/puppettest/support/utils.rb
index e022f123c..bca5d9634 100644
--- a/test/lib/puppettest/support/utils.rb
+++ b/test/lib/puppettest/support/utils.rb
@@ -92,7 +92,7 @@ module PuppetTest::Support::Utils
     method = type
 
     trans.send(method)
-    newevents = trans.events.reject { |e| e.status == 'failure' }.collect { |e|
+    newevents = trans.events.reject { |e| ['failure', 'audit'].include? e.status }.collect { |e|
       e.name
     }
 
diff --git a/test/network/authconfig.rb b/test/network/authconfig.rb
index f53238d0b..3a4f18838 100755
--- a/test/network/authconfig.rb
+++ b/test/network/authconfig.rb
@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-require File.dirname(__FILE__) + '/../lib/puppettest'
+require File.expand_path(File.dirname(__FILE__) + '/../lib/puppettest')
 
 require 'puppettest'
 
diff --git a/test/network/authorization.rb b/test/network/authorization.rb
index f29fe2554..5a1254a84 100755
--- a/test/network/authorization.rb
+++ b/test/network/authorization.rb
@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-require File.dirname(__FILE__) + '/../lib/puppettest'
+require File.expand_path(File.dirname(__FILE__) + '/../lib/puppettest')
 
 require 'puppettest'
 require 'puppet/network/authorization'
diff --git a/test/network/authstore.rb b/test/network/authstore.rb
index e608423bf..e3c185302 100755
--- a/test/network/authstore.rb
+++ b/test/network/authstore.rb
@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-require File.dirname(__FILE__) + '/../lib/puppettest'
+require File.expand_path(File.dirname(__FILE__) + '/../lib/puppettest')
 
 require 'puppettest'
 require 'mocha'
diff --git a/test/network/client/ca.rb b/test/network/client/ca.rb
index 5037fe48d..fcb950174 100755
--- a/test/network/client/ca.rb
+++ b/test/network/client/ca.rb
@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-require File.dirname(__FILE__) + '/../../lib/puppettest'
+require File.expand_path(File.dirname(__FILE__) + '/../../lib/puppettest')
 
 require 'mocha'
 require 'puppettest'
diff --git a/test/network/client/dipper.rb b/test/network/client/dipper.rb
index d4f784628..45f3a7a5c 100755
--- a/test/network/client/dipper.rb
+++ b/test/network/client/dipper.rb
@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-require File.dirname(__FILE__) + '/../../lib/puppettest'
+require File.expand_path(File.dirname(__FILE__) + '/../../lib/puppettest')
 
 require 'puppettest'
 require 'puppet/file_bucket/dipper'
diff --git a/test/network/client_request.rb b/test/network/client_request.rb
index 25fc57ff4..96b9d3e4f 100755
--- a/test/network/client_request.rb
+++ b/test/network/client_request.rb
@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-require File.dirname(__FILE__) + '/../lib/puppettest'
+require File.expand_path(File.dirname(__FILE__) + '/../lib/puppettest')
 
 require 'puppettest'
 
diff --git a/test/network/handler/ca.rb b/test/network/handler/ca.rb
index 79a1b15dc..e27e9c29b 100755
--- a/test/network/handler/ca.rb
+++ b/test/network/handler/ca.rb
@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-require File.dirname(__FILE__) + '/../../lib/puppettest'
+require File.expand_path(File.dirname(__FILE__) + '/../../lib/puppettest')
 
 require 'puppettest'
 require 'puppet/network/handler/ca'
diff --git a/test/network/handler/fileserver.rb b/test/network/handler/fileserver.rb
index d979821bb..b76f8e199 100755
--- a/test/network/handler/fileserver.rb
+++ b/test/network/handler/fileserver.rb
@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-require File.dirname(__FILE__) + '/../../lib/puppettest'
+require File.expand_path(File.dirname(__FILE__) + '/../../lib/puppettest')
 
 require 'puppettest'
 require 'puppet/network/handler/fileserver'
diff --git a/test/network/handler/master.rb b/test/network/handler/master.rb
index 81869ac06..4c0374a76 100755
--- a/test/network/handler/master.rb
+++ b/test/network/handler/master.rb
@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-require File.dirname(__FILE__) + '/../../lib/puppettest'
+require File.expand_path(File.dirname(__FILE__) + '/../../lib/puppettest')
 
 require 'puppettest'
 require 'puppet/network/handler/master'
@@ -13,7 +13,7 @@ class TestMaster < Test::Unit::TestCase
     @master = Puppet::Network::Handler.master.new(:Manifest => tempfile)
 
     @catalog = stub 'catalog', :extract => ""
-    Puppet::Resource::Catalog.stubs(:find).returns(@catalog)
+    Puppet::Resource::Catalog.indirection.stubs(:find).returns(@catalog)
   end
 
   def teardown
@@ -32,15 +32,17 @@ class TestMaster < Test::Unit::TestCase
 
   def test_hostname_is_used_if_client_is_missing
     @master.expects(:decode_facts).returns("hostname" => "yay")
-    Puppet::Node::Facts.expects(:new).with { |name, facts| name == "yay" }.returns(stub('facts', :save => nil))
+    facts = Puppet::Node::Facts.new("the_facts")
+    Puppet::Node::Facts.indirection.stubs(:save).with(facts)
+    Puppet::Node::Facts.expects(:new).with { |name, facts| name == "yay" }.returns(facts)
 
     @master.getconfig("facts")
   end
 
   def test_facts_are_saved
-    facts = mock('facts')
+    facts = Puppet::Node::Facts.new("the_facts")
     Puppet::Node::Facts.expects(:new).returns(facts)
-    facts.expects(:save)
+    Puppet::Node::Facts.indirection.expects(:save).with(facts)
 
     @master.stubs(:decode_facts)
 
@@ -48,12 +50,13 @@ class TestMaster < Test::Unit::TestCase
   end
 
   def test_catalog_is_used_for_compiling
-    facts = stub('facts', :save => nil)
+    facts = Puppet::Node::Facts.new("the_facts")
+    Puppet::Node::Facts.indirection.stubs(:save).with(facts)
     Puppet::Node::Facts.stubs(:new).returns(facts)
 
     @master.stubs(:decode_facts)
 
-    Puppet::Resource::Catalog.expects(:find).with("foo.com").returns(@catalog)
+    Puppet::Resource::Catalog.indirection.expects(:find).with("foo.com").returns(@catalog)
 
     @master.getconfig("facts", "yaml", "foo.com")
   end
@@ -61,14 +64,15 @@ end
 
 class TestMasterFormats < Test::Unit::TestCase
   def setup
-    @facts = stub('facts', :save => nil)
+    @facts = Puppet::Node::Facts.new("the_facts")
     Puppet::Node::Facts.stubs(:new).returns(@facts)
+    Puppet::Node::Facts.indirection.stubs(:save)
 
     @master = Puppet::Network::Handler.master.new(:Code => "")
     @master.stubs(:decode_facts)
 
     @catalog = stub 'catalog', :extract => ""
-    Puppet::Resource::Catalog.stubs(:find).returns(@catalog)
+    Puppet::Resource::Catalog.indirection.stubs(:find).returns(@catalog)
   end
 
   def test_marshal_can_be_used
diff --git a/test/network/handler/report.rb b/test/network/handler/report.rb
index 590dcdb13..d0c223878 100755
--- a/test/network/handler/report.rb
+++ b/test/network/handler/report.rb
@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-require File.dirname(__FILE__) + '/../../lib/puppettest'
+require File.expand_path(File.dirname(__FILE__) + '/../../lib/puppettest')
 
 require 'puppettest'
 require 'puppet/network/handler/report'
diff --git a/test/network/handler/runner.rb b/test/network/handler/runner.rb
index 396568b29..d03fb2c89 100755
--- a/test/network/handler/runner.rb
+++ b/test/network/handler/runner.rb
@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-require File.dirname(__FILE__) + '/../../lib/puppettest'
+require File.expand_path(File.dirname(__FILE__) + '/../../lib/puppettest')
 
 require 'puppettest'
 require 'puppet/network/handler/runner'
diff --git a/test/network/rights.rb b/test/network/rights.rb
index df032b5a9..0167a98f1 100755
--- a/test/network/rights.rb
+++ b/test/network/rights.rb
@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-require File.dirname(__FILE__) + '/../lib/puppettest'
+require File.expand_path(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 7bb2df150..ca215ee25 100755
--- a/test/network/server/mongrel_test.rb
+++ b/test/network/server/mongrel_test.rb
@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-require File.dirname(__FILE__) + '/../../lib/puppettest'
+require File.expand_path(File.dirname(__FILE__) + '/../../lib/puppettest')
 
 require 'puppettest'
 require 'mocha'
@@ -95,11 +95,5 @@ class TestMongrelServer < PuppetTest::TestCase
     assert_equal(ip, info.ip, "Did not copy over ip correctly")
     assert_equal(Resolv.getname(ip), info.name, "Did not look up hostname correctly")
   end
-
-  def test_daemonize
-    mongrel = mkserver
-
-    assert(mongrel.respond_to?(:daemonize), "Mongrel server does not respond to daemonize")
-  end
 end
 
diff --git a/test/network/server/webrick.rb b/test/network/server/webrick.rb
index e203894d9..624147b6c 100755
--- a/test/network/server/webrick.rb
+++ b/test/network/server/webrick.rb
@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-require File.dirname(__FILE__) + '/../../lib/puppettest'
+require File.expand_path(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 7e7f36944..73159a994 100755
--- a/test/network/xmlrpc/client.rb
+++ b/test/network/xmlrpc/client.rb
@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-require File.dirname(__FILE__) + '/../../lib/puppettest'
+require File.expand_path(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 0c990c9e8..379b34a85 100755
--- a/test/network/xmlrpc/processor.rb
+++ b/test/network/xmlrpc/processor.rb
@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-require File.dirname(__FILE__) + '/../../lib/puppettest'
+require File.expand_path(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 a5474b08c..0653f009e 100755
--- a/test/network/xmlrpc/server.rb
+++ b/test/network/xmlrpc/server.rb
@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-require File.dirname(__FILE__) + '/../../lib/puppettest'
+require File.expand_path(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 47bad27c2..f2faf09ec 100755
--- a/test/network/xmlrpc/webrick_servlet.rb
+++ b/test/network/xmlrpc/webrick_servlet.rb
@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-require File.dirname(__FILE__) + '/../../lib/puppettest'
+require File.expand_path(File.dirname(__FILE__) + '/../../lib/puppettest')
 
 require 'puppettest'
 require 'puppettest/support/utils'
diff --git a/test/other/provider.rb b/test/other/provider.rb
index a539ee5a7..c31c6bfb9 100755
--- a/test/other/provider.rb
+++ b/test/other/provider.rb
@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-require File.dirname(__FILE__) + '/../lib/puppettest'
+require File.expand_path(File.dirname(__FILE__) + '/../lib/puppettest')
 
 require 'puppet'
 require 'puppet/provider'
diff --git a/test/other/puppet.rb b/test/other/puppet.rb
index 657bdefca..9fb53ddba 100755
--- a/test/other/puppet.rb
+++ b/test/other/puppet.rb
@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-require File.dirname(__FILE__) + '/../lib/puppettest'
+require File.expand_path(File.dirname(__FILE__) + '/../lib/puppettest')
 
 require 'puppet'
 require 'puppettest'
diff --git a/test/other/relationships.rb b/test/other/relationships.rb
index df4d3a96e..717353c02 100755
--- a/test/other/relationships.rb
+++ b/test/other/relationships.rb
@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-require File.dirname(__FILE__) + '/../lib/puppettest'
+require File.expand_path(File.dirname(__FILE__) + '/../lib/puppettest')
 
 require 'puppet'
 require 'puppettest'
diff --git a/test/other/report.rb b/test/other/report.rb
index 8a909b41c..ce7d31e3b 100755
--- a/test/other/report.rb
+++ b/test/other/report.rb
@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-require File.dirname(__FILE__) + '/../lib/puppettest'
+require File.expand_path(File.dirname(__FILE__) + '/../lib/puppettest')
 
 require 'puppet'
 require 'puppet/reports'
diff --git a/test/other/transactions.rb b/test/other/transactions.rb
index 6655d8645..be8cef483 100755
--- a/test/other/transactions.rb
+++ b/test/other/transactions.rb
@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-require File.dirname(__FILE__) + '/../lib/puppettest'
+require File.expand_path(File.dirname(__FILE__) + '/../lib/puppettest')
 
 require 'mocha'
 require 'puppet'
diff --git a/test/puppet/defaults.rb b/test/puppet/defaults.rb
index d290cef1f..18c74bf49 100755
--- a/test/puppet/defaults.rb
+++ b/test/puppet/defaults.rb
@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-require File.dirname(__FILE__) + '/../lib/puppettest'
+require File.expand_path(File.dirname(__FILE__) + '/../lib/puppettest')
 
 require 'puppet'
 require 'puppettest'
diff --git a/test/puppet/errortest.rb b/test/puppet/errortest.rb
index bb81b0d3f..35f2ed39e 100755
--- a/test/puppet/errortest.rb
+++ b/test/puppet/errortest.rb
@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-require File.dirname(__FILE__) + '/../lib/puppettest'
+require File.expand_path(File.dirname(__FILE__) + '/../lib/puppettest')
 
 require 'puppet'
 require 'puppettest'
diff --git a/test/puppet/tc_suidmanager.rb b/test/puppet/tc_suidmanager.rb
index eeb56f2c9..2f4cb40da 100755
--- a/test/puppet/tc_suidmanager.rb
+++ b/test/puppet/tc_suidmanager.rb
@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-require File.dirname(__FILE__) + '/../lib/puppettest'
+require File.expand_path(File.dirname(__FILE__) + '/../lib/puppettest')
 
 require 'puppet'
 require 'puppettest'
diff --git a/test/rails/rails.rb b/test/rails/rails.rb
index 6a5bd7b17..75987b95e 100755
--- a/test/rails/rails.rb
+++ b/test/rails/rails.rb
@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-require File.dirname(__FILE__) + '/../lib/puppettest'
+require File.expand_path(File.dirname(__FILE__) + '/../lib/puppettest')
 
 require 'puppet'
 require 'puppet/rails'
diff --git a/test/rails/railsparameter.rb b/test/rails/railsparameter.rb
index 77ce33912..fafa2b7e7 100755
--- a/test/rails/railsparameter.rb
+++ b/test/rails/railsparameter.rb
@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-require File.dirname(__FILE__) + '/../lib/puppettest'
+require File.expand_path(File.dirname(__FILE__) + '/../lib/puppettest')
 
 require 'puppet'
 require 'puppet/rails'
diff --git a/test/ral/manager/attributes.rb b/test/ral/manager/attributes.rb
index 6d0284d9e..030f38c50 100755
--- a/test/ral/manager/attributes.rb
+++ b/test/ral/manager/attributes.rb
@@ -3,7 +3,7 @@
 #  Created by Luke A. Kanies on 2007-02-05.
 #  Copyright (c) 2007. All rights reserved.
 
-require File.dirname(__FILE__) + '/../../lib/puppettest'
+require File.expand_path(File.dirname(__FILE__) + '/../../lib/puppettest')
 
 require 'puppettest'
 require 'mocha'
diff --git a/test/ral/manager/instances.rb b/test/ral/manager/instances.rb
index dd1cf054e..f1731ac64 100755
--- a/test/ral/manager/instances.rb
+++ b/test/ral/manager/instances.rb
@@ -3,7 +3,7 @@
 #  Created by Luke A. Kanies on 2007-06-10.
 #  Copyright (c) 2007. All rights reserved.
 
-require File.dirname(__FILE__) + '/../../lib/puppettest'
+require File.expand_path(File.dirname(__FILE__) + '/../../lib/puppettest')
 
 require 'puppettest'
 
diff --git a/test/ral/manager/manager.rb b/test/ral/manager/manager.rb
index 76b1d97fe..9c9449a45 100755
--- a/test/ral/manager/manager.rb
+++ b/test/ral/manager/manager.rb
@@ -3,7 +3,7 @@
 #  Created by Luke A. Kanies on 2006-11-29.
 #  Copyright (c) 2006. All rights reserved.
 
-require File.dirname(__FILE__) + '/../../lib/puppettest'
+require File.expand_path(File.dirname(__FILE__) + '/../../lib/puppettest')
 
 require 'puppettest'
 
diff --git a/test/ral/manager/provider.rb b/test/ral/manager/provider.rb
index d4c8a3407..1d7265b7c 100755
--- a/test/ral/manager/provider.rb
+++ b/test/ral/manager/provider.rb
@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-require File.dirname(__FILE__) + '/../../lib/puppettest'
+require File.expand_path(File.dirname(__FILE__) + '/../../lib/puppettest')
 
 require 'puppettest'
 require 'mocha'
diff --git a/test/ral/manager/type.rb b/test/ral/manager/type.rb
index 145877722..c2e6a0c1e 100755
--- a/test/ral/manager/type.rb
+++ b/test/ral/manager/type.rb
@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-require File.dirname(__FILE__) + '/../../lib/puppettest'
+require File.expand_path(File.dirname(__FILE__) + '/../../lib/puppettest')
 
 require 'mocha'
 require 'puppettest'
diff --git a/test/ral/providers/cron/crontab.rb b/test/ral/providers/cron/crontab.rb
index be2af1e16..3475cf6f1 100755
--- a/test/ral/providers/cron/crontab.rb
+++ b/test/ral/providers/cron/crontab.rb
@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-require File.dirname(__FILE__) + '/../../../lib/puppettest'
+require File.expand_path(File.dirname(__FILE__) + '/../../../lib/puppettest')
 
 require 'puppettest'
 require 'mocha'
diff --git a/test/ral/providers/group.rb b/test/ral/providers/group.rb
index 8a0860551..4259be355 100755
--- a/test/ral/providers/group.rb
+++ b/test/ral/providers/group.rb
@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-require File.dirname(__FILE__) + '/../../lib/puppettest'
+require File.expand_path(File.dirname(__FILE__) + '/../../lib/puppettest')
 
 require 'puppettest'
 require 'etc'
diff --git a/test/ral/providers/host/parsed.rb b/test/ral/providers/host/parsed.rb
index 955edd5d3..521654d53 100755
--- a/test/ral/providers/host/parsed.rb
+++ b/test/ral/providers/host/parsed.rb
@@ -1,8 +1,7 @@
 #!/usr/bin/env ruby
 
-require File.dirname(__FILE__) + '/../../../lib/puppettest'
+require File.expand_path(File.dirname(__FILE__) + '/../../../lib/puppettest')
 
-require 'etc'
 require 'puppettest'
 require 'puppettest/fileparsing'
 require 'test/unit'
@@ -25,213 +24,9 @@ class TestParsedHostProvider < Test::Unit::TestCase
     super
   end
 
-  def test_provider_existence
-    assert(@provider, "Could not retrieve provider")
-  end
-
-  # Here we just create a fake host type that answers to all of the methods
-  # but does not modify our actual system.
-  def mkfaketype
-    @provider.filetype = Puppet::Util::FileType.filetype(:ram)
-  end
-
-  def mkhosthash
-    if defined?(@hcount)
-      @hcount += 1
-    else
-      @hcount = 1
-    end
-
-    return {
-      :name => "fakehost#{@hcount}",
-      :ip => "192.168.27.#{@hcount}",
-      :host_aliases => ["alias#{@hcount}"],
-      :ensure => :present
-    }
-  end
-
-  def mkhost
-    hash = mkhosthash
-
-    fakeresource = fakeresource(:host, hash[:name])
-
-    host = @provider.new(fakeresource)
-
-    assert(host, "Could not create provider host")
-    hash.each do |name, val|
-      host.send(name.to_s + "=", val)
-    end
-
-    host
-  end
-
-  # Make sure we convert both directlys correctly using a simple host.
-  def test_basic_isomorphism
-    hash = {:record_type => :parsed, :name => "myhost", :ip => "192.168.43.56", :host_aliases => %w{another host},
-            :comment => ''}
-
-    str = nil
-    assert_nothing_raised do
-      str = @provider.to_line(hash)
-    end
-
-    assert_equal("192.168.43.56\tmyhost\tanother\thost", str)
-
-    newhash = nil
-    assert_nothing_raised do
-      newhash = @provider.parse(str).shift
-    end
-
-    assert_equal(hash, newhash)
-  end
-
-  # Make sure parsing gets comments, blanks, and hosts
-  def test_blanks_and_comments
-    mkfaketype
-    text = %{# comment one
-
-192.168.43.56\tmyhost\tanother\thost
-    
-# another comment
-192.168.43.57\tanotherhost
-}
-
-    instances = nil
-    assert_nothing_raised do
-      instances = @provider.parse(text)
-    end
-
-
-          assert_equal(
-        [
-      {:record_type => :comment, :line => "# comment one"},
-      {:record_type => :blank, :line => ""},
-      {:record_type => :parsed, :name => "myhost", :ip => "192.168.43.56", :host_aliases => %w{another host},
-       :comment => ''},
-      {:record_type => :blank, :line => "    "},
-      {:record_type => :comment, :line => "# another comment"},
-        
-      {:record_type => :parsed, :name => "anotherhost", :ip => "192.168.43.57", :host_aliases => [],
-       :comment => ''}
-    ], instances)
-
-    newtext = nil
-    assert_nothing_raised do
-      newtext = @provider.to_file(instances).gsub(/^# HEADER.+\n/, '')
-    end
-
-    assert_equal(text, newtext)
-  end
-
-  def test_simplehost
-    mkfaketype
-    @provider.default_target = :yayness
-    file = @provider.target_object(:yayness)
-
-    # Start out with no content.
-    assert_nothing_raised {
-      assert_equal([], @provider.parse(file.read))
-    }
-
-    # Now create a provider
-    host = nil
-    assert_nothing_raised {
-      host = mkhost
-    }
-
-    # Make sure we're still empty
-    assert_nothing_raised {
-      assert_equal([], @provider.parse(file.read))
-    }
-
-    # Try storing it
-    assert_nothing_raised do
-      host.flush
-    end
-
-    # Make sure we get the host back
-    assert_nothing_raised {
-
-            assert(
-        file.read.include?(host.name),
-        
-        "Did not flush host to disk")
-    }
-
-    # Remove a single field and make sure it gets tossed
-    name = host.host_aliases
-    host.host_aliases = [:absent]
-
-    assert_nothing_raised {
-      host.flush
-
-            assert(
-        ! file.read.include?(name[0]),
-        
-        "Did not remove host_aliases from disk")
-    }
-
-    # Make sure it throws up if we remove a required field
-    host.ip = :absent
-
-    assert_raise(ArgumentError) {
-      host.flush
-    }
-
-    # Now remove the whole object
-    host.ensure = :absent
-    assert_nothing_raised {
-      host.flush
-      assert_equal([], @provider.parse(file.read))
-    }
-  end
-
   # Parse our sample data and make sure we regenerate it correctly.
   def test_hostsparse
     fakedata("data/types/hosts").each do |file| fakedataparse(file) end
   end
-
-  # Make sure we can modify the file elsewhere and those modifications will
-  # get taken into account.
-  def test_modifyingfile
-    hostfile = tempfile
-    @provider.default_target = hostfile
-
-    file = @provider.target_object(hostfile)
-
-    hosts = []
-    3.times {
-      h = mkhost
-      hosts << h
-    }
-
-    hosts.each do |host|
-      host.flush
-    end
-
-    newhost = mkhost
-    hosts << newhost
-
-    # Now store our new host
-    newhost.flush
-
-    # Verify we can retrieve that info
-    assert_nothing_raised("Could not retrieve after second write") {
-      @provider.prefetch
-    }
-
-    text = file.read
-
-    instances = @provider.parse(text)
-
-    # And verify that we have data for everything
-    hosts.each { |host|
-      name = host.resource[:name]
-      assert(text.include?(name), "Host #{name} is not in file")
-      hash = host.property_hash
-      assert(! hash.empty?, "Could not find host #{name}")
-      assert(hash[:ip], "Could not find ip for host #{name}")
-    }
-  end
 end
 
diff --git a/test/ral/providers/mailalias/aliases.rb b/test/ral/providers/mailalias/aliases.rb
index 0497528c3..9cd2fc354 100755
--- a/test/ral/providers/mailalias/aliases.rb
+++ b/test/ral/providers/mailalias/aliases.rb
@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-require File.dirname(__FILE__) + '/../../../lib/puppettest'
+require File.expand_path(File.dirname(__FILE__) + '/../../../lib/puppettest')
 
 require 'puppettest'
 require 'puppettest/fileparsing'
diff --git a/test/ral/providers/nameservice.rb b/test/ral/providers/nameservice.rb
index 967c59f92..a04b45b1f 100755
--- a/test/ral/providers/nameservice.rb
+++ b/test/ral/providers/nameservice.rb
@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-require File.dirname(__FILE__) + '/../../lib/puppettest'
+require File.expand_path(File.dirname(__FILE__) + '/../../lib/puppettest')
 
 require 'puppettest'
 require 'puppet/provider/nameservice'
diff --git a/test/ral/providers/package.rb b/test/ral/providers/package.rb
index 9c5e0dfa6..5264443bc 100755
--- a/test/ral/providers/package.rb
+++ b/test/ral/providers/package.rb
@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-require File.dirname(__FILE__) + '/../../lib/puppettest'
+require File.expand_path(File.dirname(__FILE__) + '/../../lib/puppettest')
 
 require 'puppettest'
 require 'etc'
diff --git a/test/ral/providers/package/aptitude.rb b/test/ral/providers/package/aptitude.rb
index 34eba10bf..871de9ded 100755
--- a/test/ral/providers/package/aptitude.rb
+++ b/test/ral/providers/package/aptitude.rb
@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-require File.dirname(__FILE__) + '/../../../lib/puppettest'
+require File.expand_path(File.dirname(__FILE__) + '/../../../lib/puppettest')
 
 require 'mocha'
 
diff --git a/test/ral/providers/package/aptrpm.rb b/test/ral/providers/package/aptrpm.rb
index 5f2a0d274..a9646696a 100755
--- a/test/ral/providers/package/aptrpm.rb
+++ b/test/ral/providers/package/aptrpm.rb
@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-require File.dirname(__FILE__) + '/../../../lib/puppettest'
+require File.expand_path(File.dirname(__FILE__) + '/../../../lib/puppettest')
 
 require 'mocha'
 
diff --git a/test/ral/providers/parsedfile.rb b/test/ral/providers/parsedfile.rb
index c7e5d9b04..b9e33e56c 100755
--- a/test/ral/providers/parsedfile.rb
+++ b/test/ral/providers/parsedfile.rb
@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-require File.dirname(__FILE__) + '/../../lib/puppettest'
+require File.expand_path(File.dirname(__FILE__) + '/../../lib/puppettest')
 
 require 'puppettest'
 require 'mocha'
diff --git a/test/ral/providers/port/parsed.rb b/test/ral/providers/port/parsed.rb
index 13cc87d2c..062044796 100755
--- a/test/ral/providers/port/parsed.rb
+++ b/test/ral/providers/port/parsed.rb
@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-require File.dirname(__FILE__) + '/../../../lib/puppettest'
+require File.expand_path(File.dirname(__FILE__) + '/../../../lib/puppettest')
 
 require 'puppettest'
 #require 'puppettest/fileparsing'
diff --git a/test/ral/providers/provider.rb b/test/ral/providers/provider.rb
index f46e03f82..a9f5ad21c 100755
--- a/test/ral/providers/provider.rb
+++ b/test/ral/providers/provider.rb
@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-require File.dirname(__FILE__) + '/../../lib/puppettest'
+require File.expand_path(File.dirname(__FILE__) + '/../../lib/puppettest')
 
 require 'puppettest'
 require 'facter'
diff --git a/test/ral/providers/service/base.rb b/test/ral/providers/service/base.rb
index 82d36ab98..112246b12 100755
--- a/test/ral/providers/service/base.rb
+++ b/test/ral/providers/service/base.rb
@@ -3,7 +3,7 @@
 #  Created by Luke A. Kanies on 2007-01-28.
 #  Copyright (c) 2007. All rights reserved.
 
-require File.dirname(__FILE__) + '/../../../lib/puppettest'
+require File.expand_path(File.dirname(__FILE__) + '/../../../lib/puppettest')
 
 require 'puppettest'
 
diff --git a/test/ral/providers/sshkey/parsed.rb b/test/ral/providers/sshkey/parsed.rb
index f21158fed..2a6041406 100755
--- a/test/ral/providers/sshkey/parsed.rb
+++ b/test/ral/providers/sshkey/parsed.rb
@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-require File.dirname(__FILE__) + '/../../../lib/puppettest'
+require File.expand_path(File.dirname(__FILE__) + '/../../../lib/puppettest')
 
 require 'puppettest'
 require 'puppettest/fileparsing'
diff --git a/test/ral/providers/user.rb b/test/ral/providers/user.rb
index 64f833f6a..ebf2ab700 100755
--- a/test/ral/providers/user.rb
+++ b/test/ral/providers/user.rb
@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-require File.dirname(__FILE__) + '/../../lib/puppettest'
+require File.expand_path(File.dirname(__FILE__) + '/../../lib/puppettest')
 
 require 'puppettest'
 require 'puppettest/support/utils'
diff --git a/test/ral/providers/user/useradd.rb b/test/ral/providers/user/useradd.rb
index 12e1f7ffc..6350ec6dc 100755
--- a/test/ral/providers/user/useradd.rb
+++ b/test/ral/providers/user/useradd.rb
@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-require File.dirname(__FILE__) + '/../../../lib/puppettest'
+require File.expand_path(File.dirname(__FILE__) + '/../../../lib/puppettest')
 
 require 'mocha'
 
diff --git a/test/ral/type/cron.rb b/test/ral/type/cron.rb
index a941caec8..ae280e04f 100755
--- a/test/ral/type/cron.rb
+++ b/test/ral/type/cron.rb
@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-require File.dirname(__FILE__) + '/../../lib/puppettest'
+require File.expand_path(File.dirname(__FILE__) + '/../../lib/puppettest')
 
 require 'puppettest'
 
diff --git a/test/ral/type/exec.rb b/test/ral/type/exec.rb
index 5b26a98a2..933994b88 100755
--- a/test/ral/type/exec.rb
+++ b/test/ral/type/exec.rb
@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-require File.dirname(__FILE__) + '/../../lib/puppettest'
+require File.expand_path(File.dirname(__FILE__) + '/../../lib/puppettest')
 
 require 'puppettest'
 
diff --git a/test/ral/type/file.rb b/test/ral/type/file.rb
index 6322529cf..2285e72c8 100755
--- a/test/ral/type/file.rb
+++ b/test/ral/type/file.rb
@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-require File.dirname(__FILE__) + '/../../lib/puppettest'
+require File.expand_path(File.dirname(__FILE__) + '/../../lib/puppettest')
 
 require 'puppettest'
 require 'puppettest/support/utils'
@@ -612,7 +612,7 @@ class TestFile < Test::Unit::TestCase
         
       :mode => "0777"
     )
-    assert_equal(0777, file.should(:mode), "Mode did not get set correctly")
+    assert_equal("777", file.should(:mode), "Mode did not get set correctly")
     assert_apply(file)
     assert_equal(0777, File.stat(path).mode & 007777, "file mode is incorrect")
     File.unlink(path)
diff --git a/test/ral/type/file/target.rb b/test/ral/type/file/target.rb
index 339e47dcc..272128586 100755
--- a/test/ral/type/file/target.rb
+++ b/test/ral/type/file/target.rb
@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-require File.dirname(__FILE__) + '/../../../lib/puppettest'
+require File.expand_path(File.dirname(__FILE__) + '/../../../lib/puppettest')
 
 require 'puppettest'
 require 'puppettest/support/utils'
diff --git a/test/ral/type/fileignoresource.rb b/test/ral/type/fileignoresource.rb
index 3254fe293..593fcf7a7 100755
--- a/test/ral/type/fileignoresource.rb
+++ b/test/ral/type/fileignoresource.rb
@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-require File.dirname(__FILE__) + '/../../lib/puppettest'
+require File.expand_path(File.dirname(__FILE__) + '/../../lib/puppettest')
 
 require 'puppettest'
 require 'puppettest/support/utils'
diff --git a/test/ral/type/filesources.rb b/test/ral/type/filesources.rb
index dd73cea27..3363aafb3 100755
--- a/test/ral/type/filesources.rb
+++ b/test/ral/type/filesources.rb
@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-require File.dirname(__FILE__) + '/../../lib/puppettest'
+require File.expand_path(File.dirname(__FILE__) + '/../../lib/puppettest')
 
 require 'puppettest'
 require 'puppettest/support/utils'
@@ -327,12 +327,9 @@ class TestFileSources < Test::Unit::TestCase
 
     file = nil
     assert_nothing_raised {
-
-            file = Puppet::Type.type(:file).new(
-                
+      file = Puppet::Type.type(:file).new(
         :name => dest,
         :ensure => "file",
-        
         :source => source
       )
     }
diff --git a/test/ral/type/host.rb b/test/ral/type/host.rb
index 1b5bb01c9..00e1d9ef6 100755
--- a/test/ral/type/host.rb
+++ b/test/ral/type/host.rb
@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-require File.dirname(__FILE__) + '/../../lib/puppettest'
+require File.expand_path(File.dirname(__FILE__) + '/../../lib/puppettest')
 
 require 'puppettest'
 require 'test/unit'
diff --git a/test/ral/type/mailalias.rb b/test/ral/type/mailalias.rb
index 634ff2a31..1c867ef1b 100755
--- a/test/ral/type/mailalias.rb
+++ b/test/ral/type/mailalias.rb
@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-require File.dirname(__FILE__) + '/../../lib/puppettest'
+require File.expand_path(File.dirname(__FILE__) + '/../../lib/puppettest')
 
 require 'puppettest'
 require 'mocha'
diff --git a/test/ral/type/port.rb b/test/ral/type/port.rb
index 85592d14a..1daee1474 100755
--- a/test/ral/type/port.rb
+++ b/test/ral/type/port.rb
@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-require File.dirname(__FILE__) + '/../../lib/puppettest'
+require File.expand_path(File.dirname(__FILE__) + '/../../lib/puppettest')
 
 require 'puppettest'
 
diff --git a/test/ral/type/resources.rb b/test/ral/type/resources.rb
index f36df7f1d..fcfeebe10 100755
--- a/test/ral/type/resources.rb
+++ b/test/ral/type/resources.rb
@@ -3,7 +3,7 @@
 #  Created by Luke Kanies on 2006-12-12.
 #  Copyright (c) 2006. All rights reserved.
 
-require File.dirname(__FILE__) + '/../../lib/puppettest'
+require File.expand_path(File.dirname(__FILE__) + '/../../lib/puppettest')
 
 require 'puppettest'
 
diff --git a/test/ral/type/service.rb b/test/ral/type/service.rb
index 9e6469088..b7ae8dfd6 100755
--- a/test/ral/type/service.rb
+++ b/test/ral/type/service.rb
@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-require File.dirname(__FILE__) + '/../../lib/puppettest'
+require File.expand_path(File.dirname(__FILE__) + '/../../lib/puppettest')
 
 require 'puppettest'
 require 'mocha'
diff --git a/test/ral/type/sshkey.rb b/test/ral/type/sshkey.rb
index 725f188ca..2bdc00877 100755
--- a/test/ral/type/sshkey.rb
+++ b/test/ral/type/sshkey.rb
@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-require File.dirname(__FILE__) + '/../../lib/puppettest'
+require File.expand_path(File.dirname(__FILE__) + '/../../lib/puppettest')
 
 require 'puppettest'
 require 'facter'
diff --git a/test/ral/type/user.rb b/test/ral/type/user.rb
index dee6a9176..404d84f4e 100755
--- a/test/ral/type/user.rb
+++ b/test/ral/type/user.rb
@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-require File.dirname(__FILE__) + '/../../lib/puppettest'
+require File.expand_path(File.dirname(__FILE__) + '/../../lib/puppettest')
 
 require 'puppettest'
 require 'etc'
diff --git a/test/ral/type/yumrepo.rb b/test/ral/type/yumrepo.rb
index bbc1562db..086615097 100755
--- a/test/ral/type/yumrepo.rb
+++ b/test/ral/type/yumrepo.rb
@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-require File.dirname(__FILE__) + '/../../lib/puppettest'
+require File.expand_path(File.dirname(__FILE__) + '/../../lib/puppettest')
 
 require 'puppettest'
 require 'fileutils'
diff --git a/test/ral/type/zone.rb b/test/ral/type/zone.rb
index 59de99075..c93cc68bc 100755
--- a/test/ral/type/zone.rb
+++ b/test/ral/type/zone.rb
@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-require File.dirname(__FILE__) + '/../../lib/puppettest'
+require File.expand_path(File.dirname(__FILE__) + '/../../lib/puppettest')
 
 require 'puppettest'
 require 'puppet/type/zone'
diff --git a/test/test b/test/test
index 097885751..c8b9b08ef 100755
--- a/test/test
+++ b/test/test
@@ -68,7 +68,7 @@
 #
 # = Copyright
 #
-# Copyright (c) 2005 Reductive Labs, LLC
+# Copyright (c) 2005 Puppet Labs, LLC
 # Licensed under the GNU Public License
 
 require 'find'
diff --git a/test/util/classgen.rb b/test/util/classgen.rb
index 5560764d5..aa9bdbed7 100755
--- a/test/util/classgen.rb
+++ b/test/util/classgen.rb
@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-require File.dirname(__FILE__) + '/../lib/puppettest'
+require File.expand_path(File.dirname(__FILE__) + '/../lib/puppettest')
 
 require 'puppet'
 require 'puppettest'
diff --git a/test/util/execution.rb b/test/util/execution.rb
index e6509582e..316231b66 100755
--- a/test/util/execution.rb
+++ b/test/util/execution.rb
@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-require File.dirname(__FILE__) + '/../lib/puppettest'
+require File.expand_path(File.dirname(__FILE__) + '/../lib/puppettest')
 
 require 'puppet'
 require 'puppettest'
diff --git a/test/util/fileparsing.rb b/test/util/fileparsing.rb
index 05ed80a79..831f19bdb 100755
--- a/test/util/fileparsing.rb
+++ b/test/util/fileparsing.rb
@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-require File.dirname(__FILE__) + '/../lib/puppettest'
+require File.expand_path(File.dirname(__FILE__) + '/../lib/puppettest')
 
 require 'puppettest'
 require 'puppettest/fileparsing'
diff --git a/test/util/inifile.rb b/test/util/inifile.rb
index 78831ca2f..e3ce20823 100755
--- a/test/util/inifile.rb
+++ b/test/util/inifile.rb
@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-require File.dirname(__FILE__) + '/../lib/puppettest'
+require File.expand_path(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 2e3dcb3d6..61ca4e3c8 100755
--- a/test/util/instance_loader.rb
+++ b/test/util/instance_loader.rb
@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-require File.dirname(__FILE__) + '/../lib/puppettest'
+require File.expand_path(File.dirname(__FILE__) + '/../lib/puppettest')
 
 require 'puppet'
 require 'puppet/util/instance_loader'
diff --git a/test/util/log.rb b/test/util/log.rb
index 4dbd3c6d1..908347a50 100755
--- a/test/util/log.rb
+++ b/test/util/log.rb
@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-require File.dirname(__FILE__) + '/../lib/puppettest'
+require File.expand_path(File.dirname(__FILE__) + '/../lib/puppettest')
 
 require 'puppet'
 require 'puppet/util/log'
diff --git a/test/util/metrics.rb b/test/util/metrics.rb
index 82e792d0b..d1a052293 100755
--- a/test/util/metrics.rb
+++ b/test/util/metrics.rb
@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-require File.dirname(__FILE__) + '/../lib/puppettest'
+require File.expand_path(File.dirname(__FILE__) + '/../lib/puppettest')
 
 require 'puppet'
 require 'puppet/util/metric'
diff --git a/test/util/package.rb b/test/util/package.rb
index b2bb6dfcc..cd6a9d01d 100755
--- a/test/util/package.rb
+++ b/test/util/package.rb
@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-require File.dirname(__FILE__) + '/../lib/puppettest'
+require File.expand_path(File.dirname(__FILE__) + '/../lib/puppettest')
 
 require 'puppet'
 require 'puppet/util/package'
diff --git a/test/util/pidlock.rb b/test/util/pidlock.rb
index 764c7436d..beaff1089 100755
--- a/test/util/pidlock.rb
+++ b/test/util/pidlock.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../lib/puppettest'
+require File.expand_path(File.dirname(__FILE__) + '/../lib/puppettest')
 
 require 'puppet/util/pidlock'
 require 'fileutils'
diff --git a/test/util/settings.rb b/test/util/settings.rb
index ffcfbbfc2..7a7150983 100755
--- a/test/util/settings.rb
+++ b/test/util/settings.rb
@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-require File.dirname(__FILE__) + '/../lib/puppettest'
+require File.expand_path(File.dirname(__FILE__) + '/../lib/puppettest')
 
 require 'mocha'
 require 'puppettest'
diff --git a/test/util/storage.rb b/test/util/storage.rb
index f4836ce78..26bf70952 100755
--- a/test/util/storage.rb
+++ b/test/util/storage.rb
@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-require File.dirname(__FILE__) + '/../lib/puppettest'
+require File.expand_path(File.dirname(__FILE__) + '/../lib/puppettest')
 
 require 'puppet'
 require 'puppettest'
diff --git a/test/util/subclass_loader.rb b/test/util/subclass_loader.rb
index 957b6cc6c..c3453157e 100755
--- a/test/util/subclass_loader.rb
+++ b/test/util/subclass_loader.rb
@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-require File.dirname(__FILE__) + '/../lib/puppettest'
+require File.expand_path(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 0e55e1dde..1c934d612 100755
--- a/test/util/utiltest.rb
+++ b/test/util/utiltest.rb
@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-require File.dirname(__FILE__) + '/../lib/puppettest'
+require File.expand_path(File.dirname(__FILE__) + '/../lib/puppettest')
 
 require 'puppettest'
 require 'mocha'