diff options
| author | Matt Robinson <matt@puppetlabs.com> | 2010-12-06 13:05:27 -0800 |
|---|---|---|
| committer | Matt Robinson <matt@puppetlabs.com> | 2010-12-06 13:05:27 -0800 |
| commit | d4d51e3d7720108c063505884cca015aff77eff1 (patch) | |
| tree | bff625caf757ccd42b3e8dd902214531efb41fdf /test/network/handler | |
| parent | dac675c94e6ed1ee67a3081ba7379e000ee93c1c (diff) | |
| parent | 626d7564467bdc0e9d2d385e9aa10c539d9ed175 (diff) | |
| download | puppet-d4d51e3d7720108c063505884cca015aff77eff1.tar.gz puppet-d4d51e3d7720108c063505884cca015aff77eff1.tar.xz puppet-d4d51e3d7720108c063505884cca015aff77eff1.zip | |
Merge branch 'ticket/next/maint-require_spec_helper' into next
* ticket/next/maint-require_spec_helper:
maint: Use expand_path when requiring spec_helper or puppettest
maint: Fix more order dependent test failures
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' |