From: Sam Hague <shague@redhat.com>
Date: Mon, 30 Jul 2018 14:35:35 +0000 (-0400)
Subject: Always add exceptions.txt
X-Git-Tag: pre-potassium~651
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=5704d2a15fbcdba8170dd3f7db899ff11e1dc6d1;hp=9270b0410d9c1a79f6053b6778edf82c43980234;p=integration%2Ftest.git

Always add exceptions.txt

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

diff --git a/csit/libraries/KarafKeywords.robot b/csit/libraries/KarafKeywords.robot
index 4670711cf0..1c39b72adb 100644
--- a/csit/libraries/KarafKeywords.robot
+++ b/csit/libraries/KarafKeywords.robot
@@ -231,7 +231,7 @@ Get Karaf Log Lines From Test Start
     [Return]    ${log_lines}
 
 Fail If Exceptions Found During Test
-    [Arguments]    ${test_name}    ${log_file}=${KARAF_LOG}
+    [Arguments]    ${test_name}    ${log_file}=${KARAF_LOG}    ${fail}=False
     [Documentation]    Create a failure if an Exception is found in the karaf.log that has not been whitelisted.
     ...    Will work for single controller jobs as well as 3node cluster jobs
     : FOR    ${i}    IN RANGE    1    ${NUM_ODL_SYSTEM} + 1
@@ -240,7 +240,7 @@ Fail If Exceptions Found During Test
     \    ${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    Log And Fail Exceptions    ${exlist}    ${listlength}
+    \    BuiltIn.Run Keyword If    "${fail}"=="True" and ${listlength} != 0    Log And Fail Exceptions    ${exlist}    ${listlength}
     \    ...    ELSE    Collections.Log List    ${matchlist}
 
 Log And Fail Exceptions
diff --git a/csit/libraries/OpenStackOperations.robot b/csit/libraries/OpenStackOperations.robot
index 73b39b5ed6..835089748a 100644
--- a/csit/libraries/OpenStackOperations.robot
+++ b/csit/libraries/OpenStackOperations.robot
@@ -548,11 +548,11 @@ Get OvsDebugInfo
     \    OpenStackOperations.Get DumpFlows And Ovsconfig    ${conn_id}
 
 Get Test Teardown Debugs
-    [Arguments]    ${test_name}=${SUITE_NAME}.${TEST_NAME}
+    [Arguments]    ${test_name}=${SUITE_NAME}.${TEST_NAME}    ${fail}=${FAIL_ON_EXCEPTIONS}
     OpenStackOperations.Get OvsDebugInfo
     BuiltIn.Run Keyword And Ignore Error    DataModels.Get Model Dump    ${HA_PROXY_IP}    ${netvirt_data_models}
     BuiltIn.run Keyword And Ignore Error    ODLTools.Get EOS    ${HA_PROXY_IP}
-    Run Keyword If    "${FAIL_ON_EXCEPTIONS}"=="True"    KarafKeywords.Fail If Exceptions Found During Test    ${test_name}
+    KarafKeywords.Fail If Exceptions Found During Test    ${test_name}    fail=${fail}
 
 Get Test Teardown Debugs For SFC
     [Arguments]    ${test_name}=${TEST_NAME}