Update exception file output

Change-Id: I08dc0185c3f6ee8ef1ded723bb77591899bfa482
Signed-off-by: Sam Hague <shague@redhat.com>

diff --git a/csit/libraries/KarafKeywords.robot b/csit/libraries/KarafKeywords.robot
index 69549edeca13e460e358a5564fb98162294832a6..4670711cf073e64ac215fd1911e4dabfa62e344a 100644 (file)
--- a/csit/libraries/KarafKeywords.robot
+++ b/csit/libraries/KarafKeywords.robot
@@ -219,17 +219,6 @@ Set_Bgpcep_Log_Levels
     \    Execute_Controller_Karaf_Command_On_Background    log:set ${bgpcep_level} org.opendaylight.bgpcep    member_index=${index}
     \    Execute_Controller_Karaf_Command_On_Background    log:set ${protocol_level} org.opendaylight.protocol    member_index=${index}
 
-Get and Verify Exceptions
-    [Arguments]    ${lines}
-    [Documentation]    Get a list of exceptions from the given lines from a karaf log and then verify them against a
-    ...    an exception whitelist. Verify Exceptions is a python function that will return the list of unmatched
-    ...    exceptions in exlist and return the matched exceptions in matchlist. Both lists will be logged to aid
-    ...    with troubleshooting the exceptions.
-    ${exlist}    ${matchlist} =    Verify Exceptions    ${lines}
-    Collections.Log List    ${exlist}
-    Collections.Log List    ${matchlist}
-    [Return]    ${exlist}
-
 Get Karaf Log Lines From Test Start
     [Arguments]    ${ip}    ${test_name}    ${cmd}    ${user}=${ODL_SYSTEM_USER}    ${password}=${ODL_SYSTEM_PASSWORD}    ${prompt}=${ODL_SYSTEM_PROMPT}
     ...    ${log_file}=${KARAF_LOG}
@@ -248,10 +237,18 @@ Fail If Exceptions Found During Test
     : FOR    ${i}    IN RANGE    1    ${NUM_ODL_SYSTEM} + 1
     \    ${cmd} =    Set Variable    sed '1,/ROBOT MESSAGE: Starting test ${test_name}/d' ${log_file}
     \    ${output} =    Get Karaf Log Lines From Test Start    ${ODL_SYSTEM_${i}_IP}    ${test_name}    ${cmd}
-    \    ${exlist} =    Get and Verify Exceptions    ${output}
+    \    ${exlist}    ${matchlist} =    Verify Exceptions    ${output}
     \    Write Exceptions Map To File    ${SUITE_NAME}.${TEST_NAME}    /tmp/odl${i}_exceptions.txt
     \    ${listlength} =    BuiltIn.Get Length    ${exlist}
-    \    BuiltIn.Run Keyword If    ${listlength} != 0    BuiltIn.Fail    New exceptions found: ${listlength}
+    \    BuiltIn.Run Keyword If    ${listlength} != 0    Log And Fail Exceptions    ${exlist}    ${listlength}
+    \    ...    ELSE    Collections.Log List    ${matchlist}
+
+Log And Fail Exceptions
+    [Arguments]    ${exlist}    ${listlength}
+    [Documentation]    Print the list of failed exceptions and fail the test
+    Collections.Log List    ${exlist}
+    ${exstr} =    BuiltIn.Catenate    ${exlist}
+    BuiltIn.Fail    New exceptions found: ${listlength}\n${exstr}
 
 Get Karaf Log Type From Test Start
     [Arguments]    ${ip}    ${test_name}    ${type}    ${user}=${ODL_SYSTEM_USER}    ${password}=${ODL_SYSTEM_PASSWORD}    ${prompt}=${ODL_SYSTEM_PROMPT}

diff --git a/csit/libraries/netvirt/excepts.py b/csit/libraries/netvirt/excepts.py
index 7bb5ce444531ff7c9ba67f93f36b47b3813dd21e..1f61a940e1c38f1e387b4e0064b0debf473ef202 100644 (file)
--- a/csit/libraries/netvirt/excepts.py
+++ b/csit/libraries/netvirt/excepts.py
@@ -253,10 +253,16 @@ def write_exceptions_map_to_file(testname, filename, mode="a+"):
             raise
 
     with open(filename, mode) as fp:
+        fp.write("{}\n".format("=" * 60))
         fp.write("Starting test: {}\n".format(testname))
-        fp.write("{}\n".format("-" * 40))
         for ex_idx, ex in _ex_map.items():
-            for exwe_index in ex.get("warnerr_list"):
+            fp.write("{}\n".format("-" * 40))
+            if "issue" in ex:
+                fp.write("Exception was matched to: {}\n".format(ex.get("issue")))
+            else:
+                fp.write("Exception is new\n")
+            for exwe_index in ex.get("warnerr_list")[:-1]:
                 for line in _ts_list[exwe_index]:
                     fp.write(line)
             fp.writelines(ex.get("lines"))
+            fp.write("\n")