diff options
| author | Luke Kanies <luke@madstop.com> | 2007-10-26 11:26:57 -0500 |
|---|---|---|
| committer | Luke Kanies <luke@madstop.com> | 2007-10-26 11:26:57 -0500 |
| commit | d03f68eaed6d05483128b495ad1faaf89208d66a (patch) | |
| tree | 3883c1dfb9ab8b1d4eed37eda13f7bb64ee851b8 /test/puppet | |
| parent | c0a07ac724c27fce8d2673e4466e42d46d68f145 (diff) | |
| download | puppet-d03f68eaed6d05483128b495ad1faaf89208d66a.tar.gz puppet-d03f68eaed6d05483128b495ad1faaf89208d66a.tar.xz puppet-d03f68eaed6d05483128b495ad1faaf89208d66a.zip | |
Changing the test/ classes so that they work from the main
test/ dir or from their own working dir, like the specs do.
This was just a question of changing how their libraries
are loaded.
Diffstat (limited to 'test/puppet')
| -rwxr-xr-x | test/puppet/conffiles.rb | 2 | ||||
| -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 |
4 files changed, 4 insertions, 4 deletions
diff --git a/test/puppet/conffiles.rb b/test/puppet/conffiles.rb index 06f563a08..750570d23 100755 --- a/test/puppet/conffiles.rb +++ b/test/puppet/conffiles.rb @@ -1,6 +1,6 @@ #!/usr/bin/env ruby -$:.unshift("../lib").unshift("../../lib") if __FILE__ =~ /\.rb$/ +require File.dirname(__FILE__) + '/../lib/puppettest' require 'puppettest' diff --git a/test/puppet/defaults.rb b/test/puppet/defaults.rb index 3d7ee384a..7befb9fa2 100755 --- a/test/puppet/defaults.rb +++ b/test/puppet/defaults.rb @@ -1,6 +1,6 @@ #!/usr/bin/env ruby -$:.unshift("../lib").unshift("../../lib") if __FILE__ =~ /\.rb$/ +require File.dirname(__FILE__) + '/../lib/puppettest' require 'puppet' require 'puppettest' diff --git a/test/puppet/errortest.rb b/test/puppet/errortest.rb index fb06a30f0..d998438f1 100755 --- a/test/puppet/errortest.rb +++ b/test/puppet/errortest.rb @@ -1,6 +1,6 @@ #!/usr/bin/env ruby -$:.unshift("../lib").unshift("../../lib") if __FILE__ =~ /\.rb$/ +require File.dirname(__FILE__) + '/../lib/puppettest' require 'puppet' require 'puppettest' diff --git a/test/puppet/tc_suidmanager.rb b/test/puppet/tc_suidmanager.rb index 905d3d0c9..2e44ead6f 100755 --- a/test/puppet/tc_suidmanager.rb +++ b/test/puppet/tc_suidmanager.rb @@ -1,6 +1,6 @@ #!/usr/bin/env ruby -$:.unshift("../lib").unshift("../../lib") if __FILE__ =~ /\.rb$/ +require File.dirname(__FILE__) + '/../lib/puppettest' require 'puppet' require 'puppettest' |