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

1 files changed, 1 insertions, 6 deletions

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