diff options
Diffstat (limited to 'test/objects')
| -rw-r--r-- | test/objects/tc_basic.rb | 17 | ||||
| -rw-r--r-- | test/objects/tc_file.rb | 8 | ||||
| -rw-r--r-- | test/objects/tc_package.rb | 6 | ||||
| -rw-r--r-- | test/objects/tc_service.rb | 8 | ||||
| -rw-r--r-- | test/objects/tc_symlink.rb | 8 |
5 files changed, 34 insertions, 13 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 ) diff --git a/test/objects/tc_file.rb b/test/objects/tc_file.rb index 97a5d8591..b92f20d04 100644 --- a/test/objects/tc_file.rb +++ b/test/objects/tc_file.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' @@ -11,7 +15,7 @@ class TestFile < Test::Unit::TestCase # objects in a central store def setup @file = nil - @path = "../examples/root/etc/configfile" + @path = File.join($blinkbase,"examples/root/etc/configfile") Blink[:debug] = 1 assert_nothing_raised() { unless Blink::Objects::File.has_key?(@path) diff --git a/test/objects/tc_package.rb b/test/objects/tc_package.rb index e9a8bb30e..38ea28e31 100644 --- a/test/objects/tc_package.rb +++ b/test/objects/tc_package.rb @@ -1,4 +1,8 @@ -$:.unshift '../lib' if __FILE__ == $0 # Make this library first! +if __FILE__ == $0 + $:.unshift '..' + $:.unshift '../../lib' + $blinkbase = "../.." +end require 'blink/objects/package' require 'test/unit' diff --git a/test/objects/tc_service.rb b/test/objects/tc_service.rb index 4967f3a01..36788eae4 100644 --- a/test/objects/tc_service.rb +++ b/test/objects/tc_service.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' @@ -20,7 +24,7 @@ class TestService < 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"] diff --git a/test/objects/tc_symlink.rb b/test/objects/tc_symlink.rb index 4dd2bd864..a75812ff3 100644 --- a/test/objects/tc_symlink.rb +++ b/test/objects/tc_symlink.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' @@ -11,7 +15,7 @@ class TestSymlink < Test::Unit::TestCase # objects in a central store def setup @symlink = nil - @path = "../examples/root/etc/symlink" + @path = File.join($blinkbase,"examples/root/etc/symlink") Kernel.system("rm -f %s" % @path) Blink[:debug] = 1 |