From 044deff1f96143b0358008e528df16b653be0515 Mon Sep 17 00:00:00 2001
From: Alexander Scheel <ascheel@redhat.com>
Date: Jun 22 2017 19:05:04 +0000
Subject: Updates testcase displayed information


Changes SUCCESS/FAILED from reflecting return code value to
expected value with PASS/FAIL, and shows expected value on
testcase failure.

Signed-off-by: Alexander Scheel <ascheel@redhat.com>

---

diff --git a/proxy/tests/testlib.py b/proxy/tests/testlib.py
index 76dff2d..eaecc34 100755
--- a/proxy/tests/testlib.py
+++ b/proxy/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,16 @@ def print_warning(key, text, io=sys.stderr):
     print_keyed("other", key, text, io)
 
 def print_return(ret, name, expected_failure):
+    key = "PASS"
+    expected = ("zero" if expected_failure == False else "nonzero")
+    if ((ret == 0 and expected_failure == True) or
+        (ret != 0 and expected_failure == False)):
+       key = "FAIL"
     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)))
+        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"