From ac28f1617a76e6c343ee12a2fd851f2a811a1a4c Mon Sep 17 00:00:00 2001 From: Jamo Luhrsen Date: Thu, 26 Apr 2018 20:31:14 +0000 Subject: [PATCH] Revert "Do not fail on ODLPARENT-152" original patch works for most cases, but has some corner cases that don't work. We can ignore the ssh NPE entirely from showing up with this patch: https://git.opendaylight.org/gerrit/#/c/71423/ This reverts commit 5cc59cbad39a4d759d8814089e7283aecfdae06c. Change-Id: I629d97dd4ee472b1943e4ef94eb6d2cbc6652227 Signed-off-by: Jamo Luhrsen --- csit/libraries/KarafKeywords.robot | 9 --------- csit/variables/netvirt/Exceptions_Whitelist.py | 2 -- 2 files changed, 11 deletions(-) diff --git a/csit/libraries/KarafKeywords.robot b/csit/libraries/KarafKeywords.robot index e172b5dd9b..d562a0c5c9 100644 --- a/csit/libraries/KarafKeywords.robot +++ b/csit/libraries/KarafKeywords.robot @@ -258,8 +258,6 @@ Verify Exception Logging In Controller ${exceptions}= Get Karaf Log Type From Test Start ${controller_ip} ${test_name} Exception @{log_lines}= Split String ${exceptions} ${\n} ${num_log_entries} Get Length ${log_lines} - # https://jira.opendaylight.org/browse/ODLPARENT-152 - Run Keyword And Return If ${num_log_entries} == ${2} Ignore ODLPARENT-152 @{log_lines} Return From Keyword If ${num_log_entries} == ${0} No Exceptions found. : FOR ${log_message} IN @{log_lines} \ Check Against White List ${log_message} ${exceptions_white_list} @@ -276,13 +274,6 @@ Check Against White List \ Return From Keyword If "${exception}" in "${exception_line}" Exceptions found, but whitelisted: ${\n}${exception_line}${\n} Fail Exceptions Found: ${\n}${exception_line}${\n} -Ignore ODLPARENT-152 - [Arguments] @{log_lines} - [Documentation] This will ignore exceptions in @{log_lines} if they match the Exception pattern found in the list - ... variable @{ODLPARENT_152}. Everything else will result in this keyword Failing. - Return From Keyword If "@{ODLPARENT_152}[0]" in "@{log_lines}[0]" and "@{ODLPARENT_152}[1]" in "@{log_lines}[1]" - Fail Exceptions found and not in the whitelist to ignore - Wait_For_Karaf_Log [Arguments] ${message} ${timeout}=60 ${member_index}=${1} [Documentation] Read karaf logs until message appear diff --git a/csit/variables/netvirt/Exceptions_Whitelist.py b/csit/variables/netvirt/Exceptions_Whitelist.py index 9e09251318..35bf3b8fbf 100644 --- a/csit/variables/netvirt/Exceptions_Whitelist.py +++ b/csit/variables/netvirt/Exceptions_Whitelist.py @@ -5,5 +5,3 @@ NETVIRT_EXCEPTIONS_WHITELIST = [ 'org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev150225.match.entries.grouping.MatchEntry msgType: 1 oxm_field: 33 experimenterID: null was not found - please verify that all needed deserializers ale loaded correctly', # noqa 'InterruptedByTimeoutException: null' ] - -ODLPARENT_152 = ['ERROR | Karaf ssh console user karaf | ShellUtil', 'java.lang.NullPointerException: null'] -- 2.36.6