Permalink
Browse files

Merge branch '3.7'

  • Loading branch information...
2 parents e32d7ca + d90cf4f commit 964b352481a2d49768535e25f8f4d78a226a3f2f @sebastianbergmann committed Oct 8, 2012
@@ -20,18 +20,18 @@ There were 3 errors:
1) Issue578Test::testNoticesDoublePrintStackTrace
Invalid error type specified
+
%s/Issue578Test.php:%i
-%s/578.php:%i
2) Issue578Test::testWarningsDoublePrintStackTrace
Invalid error type specified
+
%s/Issue578Test.php:%i
-%s/578.php:%i
3) Issue578Test::testUnexpectedExceptionsPrintsCorrectly
Exception: Double printed exception
+
%s/Issue578Test.php:%i
-%s/578.php:%i
FAILURES!
Tests: 3, Assertions: 0, Errors: 3.
@@ -20,7 +20,7 @@ There was 1 failure:
1) Warning
No tests found in class "Foo_Bar_Issue684Test".
-%s/684.php:%i
+
FAILURES!
Tests: 1, Assertions: 0, Failures: 1.
@@ -27,7 +27,6 @@ Failed asserting that two strings are equal.
-'foo'
+'bar'
-%s:%i
FAILURES!
Tests: 3, Assertions: 3, Failures: 1.
@@ -28,7 +28,6 @@ Failed asserting that two strings are equal.
-'foo'
+'bar'
-%s:%i
FAILURES!
Tests: 3, Assertions: 3, Failures: 1.

0 comments on commit 964b352

Please sign in to comment.