Merge remote-tracking branch 'ldoktor/tap'

Signed-off-by: NCleber Rosa <crosa@redhat.com>

avocado/plugins/tap.py

@@ -113,13 +113,14 @@ class TAPResult(ResultEvents):
         if state.get('text_output'):
             for line in state['text_output'].splitlines():
                 self.__write("#   %s", line)
-        if status in ("PASS", "WARN"):
+        if status == "PASS":
             self.__write("ok %s %s", result.tests_run, name)
-        elif status == "SKIP":
-            self.__write("ok %s %s  # SKIP %s", result.tests_run, name, state.get("fail_reason"))
-        elif status == "CANCEL":
-            self.__write("ok %s %s  # CANCEL %s",
-                         result.tests_run, name, state.get("fail_reason"))
+        elif status == "WARN":
+            self.__write("ok %s %s  # Warnings were printed into warn log",
+                         result.tests_run, name)
+        elif status in ("SKIP", "CANCEL"):
+            self.__write("ok %s %s  # SKIP %s", result.tests_run, name,
+                         state.get("fail_reason"))
         else:
             self.__write("not ok %s %s", result.tests_run, name)