Modifying non-existent-package test to make sure syncing fails, and modified ports package type to check the error output instead of the return code, because the portinstall command returns 0 even on failure.

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

2 files changed, 15 insertions, 2 deletions

diff --git a/lib/puppet/type/package/ports.rb b/lib/puppet/type/package/ports.rb
index b748ffb3e..972aa90be 100755
--- a/lib/puppet/type/package/ports.rb
+++ b/lib/puppet/type/package/ports.rb
@@ -13,7 +13,12 @@ module Puppet
             cmd = "/usr/local/sbin/portupgrade -p -N -P #{self[:name]}"
 
             self.debug "Executing %s" % cmd.inspect
-            output = %x{#{cmd} 2>&1}
+            output = %x{#{cmd} 2>&1 1>/dev/null}
+
+            if output =~ /\*\* No such /
+                raise Puppet::PackageError, "Could not find package %s" % self[:name]
+            end
+            #output = %x{#{cmd} 2>&1}
 
             unless $? == 0
                 raise Puppet::PackageError.new(output)
diff --git a/test/types/package.rb b/test/types/package.rb
index 73e6adf40..f43b051b8 100644
--- a/test/types/package.rb
+++ b/test/types/package.rb
@@ -150,7 +150,8 @@ class TestPackages < Test::Unit::TestCase
         obj = nil
         assert_nothing_raised {
             obj = Puppet.type(:package).create(
-                :name => "thispackagedoesnotexist"
+                :name => "thispackagedoesnotexist",
+                :ensure => :installed
             )
         }
 
@@ -162,6 +163,13 @@ class TestPackages < Test::Unit::TestCase
 
         assert_equal(:absent, obj.is(:ensure),
             "Somehow retrieved unknown pkg's version")
+
+        state = obj.state(:ensure)
+        assert(state, "Could not retrieve ensure state")
+        assert_raise(Puppet::PackageError,
+            "Successfully installed nonexistent package") {
+            state.sync
+        }
     end
 
     def test_specifypkgtype