VOL-2340 Fix device not deleted in ONOS
Change-Id: I9295a6d6f088704c7ced6087c3a7124aa2690002
diff --git a/tests/functional/Voltha_PODTests.robot b/tests/functional/Voltha_PODTests.robot
index 1307da0..1670ad7 100644
--- a/tests/functional/Voltha_PODTests.robot
+++ b/tests/functional/Voltha_PODTests.robot
@@ -183,7 +183,7 @@
Teardown Suite
[Documentation] Clean up device if desired
Run Keyword If ${teardown_device} Delete Device and Verify
- ${length}= Run Keyword If ${teardown_device} Run Keyword And Return Test Empty Device List
+ ${length}= Run Keyword If ${teardown_device} Test Empty Device List
Run Keyword If ${teardown_device} Should Be Equal As Integers ${length} 0
Run Keyword If ${teardown_device} Execute ONOS CLI Command ${k8s_node_ip} ${ONOS_SSH_PORT}
... device-remove ${of_id}