commit 301a5249a897963c7a2f61488681cf7abcd53a25
author Jeff Kaufman <jefftk@google.com> Wed Jul 10 12:44:50 2013 -0400
committer Jeff Kaufman <jefftk@google.com> Wed Jul 10 12:44:50 2013 -0400
tree c234f446b2b94c3f2e54c3a4c32fbd7dffadf35d
parent fa29f9ff32b1c64054356191025776b3b8a15813
parent 4bff89e8af56fff1ff92a8fa953e0242ea86a0d9

Merge branch 'master' into trunk-tracking

test/nginx_system_test.sh

diff --git a/test/nginx_system_test.sh b/test/nginx_system_test.sh
index f8aa5f6..435ae72 100755
--- a/test/nginx_system_test.sh
+++ b/test/nginx_system_test.sh
@@ -92,7 +92,8 @@
     | grep -v "^\\* Connection.*left intact"\
     | grep -v "^} \\[data not shown"\
     | grep -v "^\\* upload completely sent off"\
-    | grep -v "^\\*   Trying.*\\.\\.\\. connected")
+    | grep -v "^\\* connected"\
+    | grep -v "^\\*   Trying.*\\.\\.\\.")
 
   # Nothing should remain after that.
   check [ -z "$OUT" ]