commit f244d5b40c73838620ce19a4e421a7480ad26e53
author Girish Gowdra <girish@opennetworking.org> Wed Sep 01 17:16:16 2021 -0700
committer Girish Gowdra <girish@opennetworking.org> Thu Sep 02 11:09:25 2021 -0700
tree a917657f5927e23b56af12a1571f914cc5559d1e
parent a4e595280c87ad25b61be2667be6c82c05e0db7c

VOL-4334: Fix robot tests that stop logging prematurely when Delete Device
          is involved in TearDown step

Change-Id: I2e9a88ff591dfd4d178b6ed968bcc7b08446d740

tests/functional/Voltha_FailureScenarios.robot

diff --git a/tests/functional/Voltha_FailureScenarios.robot b/tests/functional/Voltha_FailureScenarios.robot
index 3d2f47e..9d9dba6 100755
--- a/tests/functional/Voltha_FailureScenarios.robot
+++ b/tests/functional/Voltha_FailureScenarios.robot
@@ -74,8 +74,9 @@
     [Tags]    functional   PowerSwitch
     [Setup]    Start Logging    ONUreboot_PowerSwitch
     [Teardown]    Run Keywords    Collect Logs
-    ...           AND             Stop Logging    ONUreboot_PowerSwitch
     ...           AND             Delete All Devices and Verify
+    ...           AND             Run Keyword If    ${logging}    Collect Logs
+    ...           AND             Stop Logging    ONUreboot_PowerSwitch
     # Add OLT device
     setup
     # Performing Sanity Test to make sure subscribers are all AUTH+DHCP and pingable
@@ -147,8 +148,9 @@
     [Tags]    functional   PhysicalOLTReboot
     [Setup]    Start Logging    PhysicalOLTReboot
     [Teardown]    Run Keywords    Collect Logs
-    ...           AND             Stop Logging    PhysicalOLTReboot
     ...           AND             Delete All Devices and Verify
+    ...           AND             Run Keyword If    ${logging}    Collect Logs
+    ...           AND             Stop Logging    PhysicalOLTReboot
     # Add OLT device
     setup
     # Performing Sanity Test to make sure subscribers are all AUTH+DHCP and pingable