Merging the webserver_portability branch from version 2182 to version 2258.

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

1 files changed, 7 insertions, 0 deletions

diff --git a/test/lib/puppettest/support/assertions.rb b/test/lib/puppettest/support/assertions.rb
index 46e4350fa..979f3fbd9 100644
--- a/test/lib/puppettest/support/assertions.rb
+++ b/test/lib/puppettest/support/assertions.rb
@@ -2,6 +2,13 @@ require 'puppettest'
 require 'fileutils'
 
 module PuppetTest
+    def assert_logged(level, regex, msg = nil)
+        # Skip verifying logs that we're not supposed to send.
+        return unless Puppet::Util::Log.sendlevel?(level)
+        r = @logs.detect { |l| l.level == level and l.message =~ regex }
+        @logs.clear
+        assert(r, msg)
+    end
 
     def assert_uid_gid(uid, gid, filename)
         flunk "Must be uid 0 to run these tests" unless Process.uid == 0