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/executables | |
| 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/executables')
| -rwxr-xr-x | test/executables/filebucket.rb | 2 | ||||
| -rwxr-xr-x | test/executables/puppetbin.rb | 2 | ||||
| -rwxr-xr-x | test/executables/puppetca.rb | 2 | ||||
| -rwxr-xr-x | test/executables/puppetd.rb | 2 | ||||
| -rwxr-xr-x | test/executables/puppetmasterd.rb | 2 | ||||
| -rwxr-xr-x | test/executables/puppetmodule.rb | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/test/executables/filebucket.rb b/test/executables/filebucket.rb index 82746bde9..491630707 100755 --- a/test/executables/filebucket.rb +++ b/test/executables/filebucket.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 'puppet/network/client' diff --git a/test/executables/puppetbin.rb b/test/executables/puppetbin.rb index e498a85d2..218787c92 100755 --- a/test/executables/puppetbin.rb +++ b/test/executables/puppetbin.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/executables/puppetca.rb b/test/executables/puppetca.rb index e1c516d98..cdc827079 100755 --- a/test/executables/puppetca.rb +++ b/test/executables/puppetca.rb @@ -1,6 +1,6 @@ #!/usr/bin/env ruby -$:.unshift("../lib").unshift("../../lib") if __FILE__ =~ /\.rb$/ +require File.dirname(__FILE__) + '/../lib/puppettest' require 'puppettest' require 'mocha' diff --git a/test/executables/puppetd.rb b/test/executables/puppetd.rb index ea63d70f2..a482e4b34 100755 --- a/test/executables/puppetd.rb +++ b/test/executables/puppetd.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 'puppet/network/client' diff --git a/test/executables/puppetmasterd.rb b/test/executables/puppetmasterd.rb index 58726db45..16f7f0f5c 100755 --- a/test/executables/puppetmasterd.rb +++ b/test/executables/puppetmasterd.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 'puppet/network/client' diff --git a/test/executables/puppetmodule.rb b/test/executables/puppetmodule.rb index 9e04bc2e8..ce28796d7 100755 --- a/test/executables/puppetmodule.rb +++ b/test/executables/puppetmodule.rb @@ -1,6 +1,6 @@ #!/usr/bin/env ruby -$:.unshift("../lib").unshift("../../lib") if __FILE__ =~ /\.rb$/ +require File.dirname(__FILE__) + '/../lib/puppettest' require 'puppettest' |