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/network/server | |
| 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/network/server')
| -rwxr-xr-x | test/network/server/mongrel_test.rb | 2 | ||||
| -rwxr-xr-x | test/network/server/webrick.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/test/network/server/mongrel_test.rb b/test/network/server/mongrel_test.rb index 52d8790eb..80e9aa454 100755 --- a/test/network/server/mongrel_test.rb +++ b/test/network/server/mongrel_test.rb @@ -1,6 +1,6 @@ #!/usr/bin/env ruby -$:.unshift("../../lib") if __FILE__ =~ /\.rb$/ +require File.dirname(__FILE__) + '/../../lib/puppettest' require 'puppettest' require 'mocha' diff --git a/test/network/server/webrick.rb b/test/network/server/webrick.rb index 5919461ed..17263817b 100755 --- a/test/network/server/webrick.rb +++ b/test/network/server/webrick.rb @@ -1,6 +1,6 @@ #!/usr/bin/env ruby -$:.unshift("../../lib") if __FILE__ =~ /\.rb$/ +require File.dirname(__FILE__) + '/../../lib/puppettest' require 'puppettest' require 'puppet/network/http_server/webrick' |
