VOL-4334: Fix robot tests that stop logging prematurely when Delete Device
is involved in TearDown step
Change-Id: I2e9a88ff591dfd4d178b6ed968bcc7b08446d740
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
diff --git a/tests/functional/Voltha_MultiOLT_Tests.robot b/tests/functional/Voltha_MultiOLT_Tests.robot
index 7a032c4..be29c0e 100755
--- a/tests/functional/Voltha_MultiOLT_Tests.robot
+++ b/tests/functional/Voltha_MultiOLT_Tests.robot
@@ -130,8 +130,9 @@
[Tags] MultiOLTSoftReboot functional
[Setup] Start Logging MultiOlt-OLTSoftReboot
[Teardown] Run Keywords Collect Logs
- ... AND Stop Logging MultiOlt-OLTSoftReboot
... AND Delete All Devices and Verify
+ ... AND Run Keyword If ${logging} Collect Logs
+ ... AND Stop Logging MultiOlt-OLTSoftReboot
# Execute the test when the number of OLTs are greater than one
Pass Execution If ${olt_count} == 1 Skipping test: just one OLT
Clear All Devices Then Perform Setup And Sanity
diff --git a/tests/functional/Voltha_PODTests.robot b/tests/functional/Voltha_PODTests.robot
index 6871e4f..f58f9b3 100755
--- a/tests/functional/Voltha_PODTests.robot
+++ b/tests/functional/Voltha_PODTests.robot
@@ -466,8 +466,9 @@
# Creates Devices in the Setup
[Setup] Start Logging DisableONU_AuthCheck
[Teardown] Run Keywords Collect Logs
- ... AND Stop Logging DisableONU_AuthCheck
... AND Delete All Devices and Verify
+ ... AND Run Keyword If ${logging} Collect Logs
+ ... AND Stop Logging DisableONU_AuthCheck
Clean WPA Process
FOR ${I} IN RANGE 0 ${num_all_onus}
${src}= Set Variable ${hosts.src[${I}]}
@@ -677,8 +678,9 @@
[Setup] Run Keywords Start Logging DisableEnableOltPonPort
... AND Setup
[Teardown] Run Keywords Collect Logs
- ... AND Stop Logging DisableEnableOltPonPort
... AND Delete All Devices and Verify
+ ... AND Run Keyword If ${logging} Collect Logs
+ ... AND Stop Logging DisableEnableOltPonPort
Run Keyword If ${has_dataplane} Clean Up Linux
Wait Until Keyword Succeeds ${timeout} 2s Perform Sanity Test
# Multi-OLTs