httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rj...@apache.org
Subject svn commit: r1422248 - /httpd/test/framework/trunk/t/apache/expr_string.t
Date Sat, 15 Dec 2012 13:30:49 GMT
Author: rjung
Date: Sat Dec 15 13:30:48 2012
New Revision: 1422248

URL: http://svn.apache.org/viewvc?rev=1422248&view=rev
Log:
Fix test that only worked on debug log level:
- only match info lines, so that higher trace
  log level lines don't confuse the test
- the hook is only logged on debug and above,
  so also match the shorter info log message

Modified:
    httpd/test/framework/trunk/t/apache/expr_string.t

Modified: httpd/test/framework/trunk/t/apache/expr_string.t
URL: http://svn.apache.org/viewvc/httpd/test/framework/trunk/t/apache/expr_string.t?rev=1422248&r1=1422247&r2=1422248&view=diff
==============================================================================
--- httpd/test/framework/trunk/t/apache/expr_string.t (original)
+++ httpd/test/framework/trunk/t/apache/expr_string.t Sat Dec 15 13:30:48 2012
@@ -62,7 +62,7 @@ foreach my $t (@test_cases) {
     else {
         print qq{Expected return code 200, got $rc for '$expr'\n};
         ok($rc == 200);
-        my @msg = grep { /log_debug:/ } @loglines;
+        my @msg = grep { /log_debug:info/ } @loglines;
         if (scalar @msg != 1) {
             print "expected 1 message, got " . scalar @msg . ":\n@msg\n";
             ok(0);
@@ -73,8 +73,9 @@ foreach my $t (@test_cases) {
                                [ ]                  # trailing space
                              ){4}                   # repeat 4 times (timestamp, level, pid,
client IP)
                              (.*?)                  # The actual message logged by LogMessage
-                             [ ]                    # a space
-                             \(log_transaction      # trailing info
+                             (,[ ]referer           # either trailing referer (LogLevel info)
+                             |                      # or
+                             [ ]\(log_transaction)  # trailing hook info (LogLevel debug
and higher)
                            }x ) {
             my $result = $1;
             print "Got '$result', expected '$expect'\n";



Mime
View raw message