diff options
| -rwxr-xr-x | test/other/tc_relationships.rb | 20 |
1 files changed, 6 insertions, 14 deletions
diff --git a/test/other/tc_relationships.rb b/test/other/tc_relationships.rb index 44960b569..c8927972b 100755 --- a/test/other/tc_relationships.rb +++ b/test/other/tc_relationships.rb @@ -1,18 +1,16 @@ if __FILE__ == $0 $:.unshift '..' $:.unshift '../../lib' - $puppetbase = "../../../../language/trunk" + $puppetbase = "../.." end require 'puppet' +require 'puppettest' require 'test/unit' -# $Id$ - -class TestRelationships < Test::Unit::TestCase +class TestRelationships < TestPuppet def setup - Puppet[:loglevel] = :debug if __FILE__ == $0 - + super @groups = %x{groups}.chomp.split(/ /) unless @groups.length > 1 p @groups @@ -20,14 +18,6 @@ class TestRelationships < Test::Unit::TestCase end end - def teardown - assert_nothing_raised() { - Puppet::Type.allclear - } - - print "\n\n" if Puppet[:debug] - end - def newfile assert_nothing_raised() { cfile = File.join($puppetbase,"examples/root/etc/configfile") @@ -72,3 +62,5 @@ class TestRelationships < Test::Unit::TestCase def test_simplerel end end + +# $Id$ |