summaryrefslogtreecommitdiffstats
path: root/test/network/client
diff options
context:
space:
mode:
authorLuke Kanies <luke@madstop.com>2007-10-26 11:26:57 -0500
committerLuke Kanies <luke@madstop.com>2007-10-26 11:26:57 -0500
commitd03f68eaed6d05483128b495ad1faaf89208d66a (patch)
tree3883c1dfb9ab8b1d4eed37eda13f7bb64ee851b8 /test/network/client
parentc0a07ac724c27fce8d2673e4466e42d46d68f145 (diff)
downloadpuppet-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/client')
-rwxr-xr-xtest/network/client/ca.rb2
-rwxr-xr-xtest/network/client/client.rb2
-rwxr-xr-xtest/network/client/dipper.rb2
-rwxr-xr-xtest/network/client/master.rb2
-rwxr-xr-xtest/network/client/resource.rb2
5 files changed, 5 insertions, 5 deletions
diff --git a/test/network/client/ca.rb b/test/network/client/ca.rb
index c996e1abd..74de37900 100755
--- a/test/network/client/ca.rb
+++ b/test/network/client/ca.rb
@@ -1,6 +1,6 @@
#!/usr/bin/env ruby
-$:.unshift("../../lib") if __FILE__ =~ /\.rb$/
+require File.dirname(__FILE__) + '/../../lib/puppettest'
require 'mocha'
require 'puppettest'
diff --git a/test/network/client/client.rb b/test/network/client/client.rb
index a297a87e1..4a7e9cdb6 100755
--- a/test/network/client/client.rb
+++ b/test/network/client/client.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/client/dipper.rb b/test/network/client/dipper.rb
index d48b50478..51494be9d 100755
--- a/test/network/client/dipper.rb
+++ b/test/network/client/dipper.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/client/resource'
diff --git a/test/network/client/master.rb b/test/network/client/master.rb
index 4ae77abc2..4f6956470 100755
--- a/test/network/client/master.rb
+++ b/test/network/client/master.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/client/resource.rb b/test/network/client/resource.rb
index 2b034f079..83c195035 100755
--- a/test/network/client/resource.rb
+++ b/test/network/client/resource.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/client/resource'