okay, all tests pass again

git-svn-id: https://reductivelabs.com/svn/puppet/library/trunk@133 980ebf18-57e1-0310-9a29-db15c13687c0

1 files changed, 11 insertions, 6 deletions

diff --git a/test/objects/tc_basic.rb b/test/objects/tc_basic.rb
index f7ffbebfa..75cec7b7b 100644
--- a/test/objects/tc_basic.rb
+++ b/test/objects/tc_basic.rb
@@ -1,4 +1,8 @@
-$:.unshift '../lib' if __FILE__ == $0 # Make this library first!
+if __FILE__ == $0
+    $:.unshift '..'
+    $:.unshift '../../lib'
+    $blinkbase = "../.."
+end
 
 require 'blink'
 require 'test/unit'
@@ -26,12 +30,13 @@ class TestBasic < Test::Unit::TestCase
         }
 
         assert_nothing_raised() {
-            unless Blink::Objects::File.has_key?("../examples/root/etc/configfile")
+            cfile = File.join($blinkbase,"examples/root/etc/configfile")
+            unless Blink::Objects::File.has_key?(cfile)
                 Blink::Objects::File.new(
-                    :path => "../examples/root/etc/configfile"
+                    :path => cfile
                 )
             end
-            @configfile = Blink::Objects::File["../examples/root/etc/configfile"]
+            @configfile = Blink::Objects::File[cfile]
         }
         assert_nothing_raised() {
             unless Blink::Objects::Service.has_key?("sleeper")
@@ -40,7 +45,7 @@ class TestBasic < Test::Unit::TestCase
                     :running => 1
                 )
                 Blink::Objects::Service.addpath(
-                    File.expand_path("../examples/root/etc/init.d")
+                    File.join($blinkbase,"examples/root/etc/init.d")
                 )
             end
             @sleeper = Blink::Objects::Service["sleeper"]
@@ -72,7 +77,7 @@ class TestBasic < Test::Unit::TestCase
         )
 
         assert_equal(
-            "../examples/root/etc/configfile",
+            File.join($blinkbase,"examples/root/etc/configfile"),
             @configfile.name
         )