diff options
| author | luke <luke@980ebf18-57e1-0310-9a29-db15c13687c0> | 2006-01-09 23:23:05 +0000 |
|---|---|---|
| committer | luke <luke@980ebf18-57e1-0310-9a29-db15c13687c0> | 2006-01-09 23:23:05 +0000 |
| commit | dccafc7e950d9111a0a4c11afebd89e1ede5e414 (patch) | |
| tree | 1d2efb7aa79a4504024e71cb9edf3bf25085d6da /test | |
| parent | b7974b59ec046837d0fdf4d732ccbedddb8de146 (diff) | |
| download | puppet-dccafc7e950d9111a0a4c11afebd89e1ede5e414.tar.gz puppet-dccafc7e950d9111a0a4c11afebd89e1ede5e414.tar.xz puppet-dccafc7e950d9111a0a4c11afebd89e1ede5e414.zip | |
Updating Puppet to work with the new Facter
git-svn-id: https://reductivelabs.com/svn/puppet/trunk@794 980ebf18-57e1-0310-9a29-db15c13687c0
Diffstat (limited to 'test')
| -rwxr-xr-x | test/types/group.rb | 2 | ||||
| -rw-r--r-- | test/types/package.rb | 27 | ||||
| -rw-r--r-- | test/types/service.rb | 2 |
3 files changed, 9 insertions, 22 deletions
diff --git a/test/types/group.rb b/test/types/group.rb index 5ea2d797d..c0ec32de6 100755 --- a/test/types/group.rb +++ b/test/types/group.rb @@ -220,7 +220,7 @@ class TestGroup < Test::Unit::TestCase comp = nil name = "pptestgr" - os = Facter["operatingsystem"].value + #os = Facter["operatingsystem"].value #if os == "Darwin" # obj = nil diff --git a/test/types/package.rb b/test/types/package.rb index 625763d80..908aa52bd 100644 --- a/test/types/package.rb +++ b/test/types/package.rb @@ -41,15 +41,8 @@ class TestPackages < Test::Unit::TestCase case $platform when "SunOS" pkgs = %w{SMCossh} - when "Linux" - case Facter["distro"].value - when "Debian": pkgs = %w{ssh openssl} - when "Fedora": pkgs = %w{openssh} - #when "RedHat": type = :rpm - else - Puppet.notice "No test package for %s" % $platform - return [] - end + when "Debian": pkgs = %w{ssh openssl} + when "Fedora": pkgs = %w{openssh} else Puppet.notice "No test package for %s" % $platform return [] @@ -62,17 +55,11 @@ class TestPackages < Test::Unit::TestCase case $platform #when "SunOS" # type = "sunpkg" - when "Linux" - case Facter["distro"].value - when "Debian": - return %w{zec} - #when "RedHat": type = :rpm - when "Fedora": - return %w{wv} - else - Puppet.notice "No test packags for %s" % $platform - return nil - end + when "Debian": + return %w{zec} + #when "RedHat": type = :rpm + when "Fedora": + return %w{wv} else Puppet.notice "No test packags for %s" % $platform return nil diff --git a/test/types/service.rb b/test/types/service.rb index cca3b2176..09971181d 100644 --- a/test/types/service.rb +++ b/test/types/service.rb @@ -10,7 +10,7 @@ require 'test/unit' $skipsvcs = false case Facter["operatingsystem"].value -when "Darwin": $skipsvcs = true +when "Darwin", "OpenBSD": $skipsvcs = true end if $skipsvcs |