summaryrefslogtreecommitdiffstats
path: root/test/network/xmlrpc
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/xmlrpc
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/xmlrpc')
-rwxr-xr-xtest/network/xmlrpc/client.rb2
-rwxr-xr-xtest/network/xmlrpc/processor.rb2
-rwxr-xr-xtest/network/xmlrpc/server.rb2
-rwxr-xr-xtest/network/xmlrpc/webrick_servlet.rb2
4 files changed, 4 insertions, 4 deletions
diff --git a/test/network/xmlrpc/client.rb b/test/network/xmlrpc/client.rb
index a81e95a86..e740e57b4 100755
--- a/test/network/xmlrpc/client.rb
+++ b/test/network/xmlrpc/client.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/xmlrpc/client'
diff --git a/test/network/xmlrpc/processor.rb b/test/network/xmlrpc/processor.rb
index bc29f4c23..079194efa 100755
--- a/test/network/xmlrpc/processor.rb
+++ b/test/network/xmlrpc/processor.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/xmlrpc/processor'
diff --git a/test/network/xmlrpc/server.rb b/test/network/xmlrpc/server.rb
index ff9f72e0c..ae9f17ddf 100755
--- a/test/network/xmlrpc/server.rb
+++ b/test/network/xmlrpc/server.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/xmlrpc/server'
diff --git a/test/network/xmlrpc/webrick_servlet.rb b/test/network/xmlrpc/webrick_servlet.rb
index 154cc6cf9..74326f6a0 100755
--- a/test/network/xmlrpc/webrick_servlet.rb
+++ b/test/network/xmlrpc/webrick_servlet.rb
@@ -1,6 +1,6 @@
#!/usr/bin/env ruby
-$:.unshift("../../lib") if __FILE__ =~ /\.rb$/
+require File.dirname(__FILE__) + '/../../lib/puppettest'
require 'puppettest'
require 'puppettest/support/utils'