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/network/handler | |
| 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/network/handler')
| -rwxr-xr-x | test/network/handler/ca.rb | 2 | ||||
| -rwxr-xr-x | test/network/handler/fileserver.rb | 2 | ||||
| -rwxr-xr-x | test/network/handler/master.rb | 2 | ||||
| -rwxr-xr-x | test/network/handler/report.rb | 2 | ||||
| -rwxr-xr-x | test/network/handler/runner.rb | 2 |
5 files changed, 5 insertions, 5 deletions
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 f4bad7037..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' 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' |