Ottomata has submitted this change and it was merged.

Change subject: Show failure reason, if test fails
......................................................................


Show failure reason, if test fails

To aid debugging, we show the expected and actual filter output for
the assert_{not_,}counted methods.

Change-Id: I1f1a8b675d0ca00cbe78676864aba8cb047c6b05
---
M tests/test.sh
1 file changed, 12 insertions(+), 4 deletions(-)

Approvals:
  Ottomata: Verified; Looks good to me, approved



diff --git a/tests/test.sh b/tests/test.sh
index 9b1e225..2053ba6 100755
--- a/tests/test.sh
+++ b/tests/test.sh
@@ -20,7 +20,14 @@
 }
 
 mark_test_failed() {
-    echo "FAIL!"
+    local REASON="$1"
+    if [ ! -z "$REASON" ]
+    then
+        REASON=" ($REASON)"
+    fi
+
+    echo "FAIL!$REASON"
+
     if [ -z "$FIRST_FAILED_TEST_NAME" ]
     then
        FIRST_FAILED_TEST_NAME="$CURRENT_TEST_NAME"
@@ -65,11 +72,12 @@
     local FILTERED_OUTPUT=
     set_FILTERED_OUTPUT "$URL" "$@"
 
-    if [ "$FILTERED_OUTPUT" = "$COUNTED_PROJECT 1 SIZE $COUNTED_PAGE" ]
+    local EXPECTED_OUTPUT="$COUNTED_PROJECT 1 SIZE $COUNTED_PAGE"
+    if [ "$FILTERED_OUTPUT" = "$EXPECTED_OUTPUT" ]
     then
        mark_test_passed
     else
-       mark_test_failed
+       mark_test_failed "Expected output: '$EXPECTED_OUTPUT'. Actual output: 
'$FILTERED_OUTPUT'"
     fi
 }
 
@@ -87,7 +95,7 @@
     then
        mark_test_passed
     else
-       mark_test_failed
+       mark_test_failed "Expected to be not counted, but counted as 
'$FILTERED_OUTPUT'"
     fi
 }
 

-- 
To view, visit https://gerrit.wikimedia.org/r/156051
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I1f1a8b675d0ca00cbe78676864aba8cb047c6b05
Gerrit-PatchSet: 2
Gerrit-Project: analytics/webstatscollector
Gerrit-Branch: master
Gerrit-Owner: QChris <christ...@quelltextlich.at>
Gerrit-Reviewer: Ottomata <o...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to