differentiating openbsd from freebsd, adding freebsd, and autoloading package types instead of manually loading them

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

3 files changed, 4 insertions, 6 deletions

diff --git a/test/language/interpreter.rb b/test/language/interpreter.rb
index c3503e646..641a5d0c9 100755
--- a/test/language/interpreter.rb
+++ b/test/language/interpreter.rb
@@ -115,6 +115,7 @@ class TestInterpreter < Test::Unit::TestCase
         files << parentfile
         hostname = Facter["hostname"].value
         lparent, lclasses = ldaphost(Facter["hostname"].value)
+        assert(lclasses, "Did not retrieve info from ldap")
         File.open(file, "w") { |f|
             f.puts "node #{lparent} {
     file { \"#{parentfile}\": ensure => file }
diff --git a/test/puppettest.rb b/test/puppettest.rb
index a2cb1438e..3959cf0fa 100644
--- a/test/puppettest.rb
+++ b/test/puppettest.rb
@@ -454,6 +454,7 @@ module ExeTest
             File.unlink(pidfile)
         end
 
+        return unless running
         if running or pid
             runningpid = nil
             %x{#{ps}}.chomp.split(/\n/).each { |line|
@@ -464,12 +465,6 @@ module ExeTest
                 end
             }
 
-            if running
-                assert(runningpid, "Process is not running")
-                assert_equal(pid, runningpid, "PIDs are not equal")
-            else
-                return
-            end
         end
 
         # we default to mandating that it's running, but teardown
diff --git a/test/types/package.rb b/test/types/package.rb
index 224e7a5f6..a2e2d6f5c 100644
--- a/test/types/package.rb
+++ b/test/types/package.rb
@@ -44,6 +44,7 @@ class TestPackages < Test::Unit::TestCase
         when "Debian": pkgs = %w{ssh openssl}
         when "Fedora": pkgs = %w{openssh}
         when "OpenBSD": pkgs = %{vim}
+        when "FreeBSD": pkgs = %{sudo}
         else
             Puppet.notice "No test package for %s" % $platform
             return []
@@ -136,6 +137,7 @@ class TestPackages < Test::Unit::TestCase
                 obj.retrieve
             }
 
+            # Version is a parameter, not a state.
             assert(obj[:version], "Could not retrieve package version")
         }
     end