diff options
| author | Matt Robinson <matt@puppetlabs.com> | 2010-12-06 12:01:18 -0800 |
|---|---|---|
| committer | Matt Robinson <matt@puppetlabs.com> | 2010-12-06 12:01:18 -0800 |
| commit | 626d7564467bdc0e9d2d385e9aa10c539d9ed175 (patch) | |
| tree | bff625caf757ccd42b3e8dd902214531efb41fdf /test/puppet | |
| parent | b9f3847cd2c7efb954f428224d8d721f9edafd64 (diff) | |
| download | puppet-626d7564467bdc0e9d2d385e9aa10c539d9ed175.tar.gz puppet-626d7564467bdc0e9d2d385e9aa10c539d9ed175.tar.xz puppet-626d7564467bdc0e9d2d385e9aa10c539d9ed175.zip | |
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
Diffstat (limited to 'test/puppet')
| -rwxr-xr-x | test/puppet/defaults.rb | 2 | ||||
| -rwxr-xr-x | test/puppet/errortest.rb | 2 | ||||
| -rwxr-xr-x | test/puppet/tc_suidmanager.rb | 2 |
3 files changed, 3 insertions, 3 deletions
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' |