maint: Use expand_path when requiring spec_helper or puppettest

Doing a require to a relative path can cause files to be required more
than once when they're required from different relative paths.  If you
expand the path fully, this won't happen.  Ruby 1.9 also requires that
you use expand_path when doing these requires.

Paired-with: Jesse Wolfe

15 files changed, 15 insertions, 15 deletions

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..1e847f8e7 100755
--- a/test/ral/providers/host/parsed.rb
+++ b/test/ral/providers/host/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 'etc'
 require 'puppettest'
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'