From a045a3a08562b1a252764b87892fc6b881623684 Mon Sep 17 00:00:00 2001
From: Alexander Scheel <ascheel@redhat.com>
Date: Jun 22 2017 21:28:07 +0000
Subject: Clarify test suite's logging


- Use PASS/FAIL instead of OO/XX
- Remove SUCCEEDED/FAILED messaging
- Show expected return code value on failure

Signed-off-by: Alexander Scheel <ascheel@redhat.com>
[rharwood@redhat.com: changed commit messsage, cleaned up code]
Reviewed-by: Robbie Harwood <rharwood@redhat.com>
Merges: #197

---

diff --git a/tests/testlib.py b/tests/testlib.py
index 76dff2d..f9833f7 100755
--- a/tests/testlib.py
+++ b/tests/testlib.py
@@ -26,13 +26,7 @@ try:
 except ImportError:
 
     def format_key(status, key):
-        if status == "success":
-            color = " OO "
-        elif status == "failure":
-            color = " XX "
-        else:
-            color = " -- "
-        return "[" + color + key + color + "]"
+        return "[" + key + "]"
 
 def print_keyed(status, key, text, io):
     print("%s %s" % (format_key(status, key), text), file=io)
@@ -49,13 +43,17 @@ def print_warning(key, text, io=sys.stderr):
     print_keyed("other", key, text, io)
 
 def print_return(ret, name, expected_failure):
-    if ((ret == 0 and expected_failure == False) or
-        (ret != 0 and expected_failure == True)):
-        print_success("SUCCESS" if ret == 0 else "FAILED",
-                      "%s test returned %s" % (name, str(ret)))
+    key = "PASS"
+    expected = "zero" if not expected_failure else "nonzero"
+    if (ret == 0 and expected_failure) or \
+       (ret != 0 and not expected_failure):
+       key = "FAIL"
+    if (ret == 0 and not expected_failure) or \
+       (ret != 0 and expected_failure):
+        print_success(key, "%s test returned %s" % (name, str(ret)))
     else:
-        print_failure("SUCCESS" if ret == 0 else "FAILED",
-                      "%s test returned %s" % (name, str(ret)))
+        print_failure(key, "%s test returned %s (expected %s)" %
+                      (name, str(ret), expected))
 
 WRAP_HOSTNAME = "kdc.gssproxy.dev"