summaryrefslogtreecommitdiffstats
path: root/test/lib
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/lib
parentc0a07ac724c27fce8d2673e4466e42d46d68f145 (diff)
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/lib')
-rwxr-xr-xtest/lib/puppettest.rb6
1 files changed, 4 insertions, 2 deletions
diff --git a/test/lib/puppettest.rb b/test/lib/puppettest.rb
index d1e690e70..eb50077b8 100755
--- a/test/lib/puppettest.rb
+++ b/test/lib/puppettest.rb
@@ -1,7 +1,9 @@
# Add .../test/lib
-$LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__)))
+testlib = File.expand_path(File.dirname(__FILE__))
+$LOAD_PATH.unshift(testlib) unless $LOAD_PATH.include?(testlib)
# Add .../lib
-$LOAD_PATH.unshift(File.expand_path(File.join(File.dirname(__FILE__), '../../lib')))
+mainlib = File.expand_path(File.join(File.dirname(__FILE__), '../../lib'))
+$LOAD_PATH.unshift(mainlib) unless $LOAD_PATH.include?(mainlib)
require 'puppet'
require 'mocha'