[VOL-4454] Optimised timeouts for tt-workflow tests
Change-Id: Ifd522a1b96540575c6635a4a6abb9ce01b324811
diff --git a/tests/tt-workflow/Voltha_TT_FailureScenarios.robot b/tests/tt-workflow/Voltha_TT_FailureScenarios.robot
index c6694da..a23d3cf 100755
--- a/tests/tt-workflow/Voltha_TT_FailureScenarios.robot
+++ b/tests/tt-workflow/Voltha_TT_FailureScenarios.robot
@@ -657,8 +657,8 @@
Wait Until Keyword Succeeds ${timeout} 5s
... Validate Device ENABLED ACTIVE
... REACHABLE ${src['onu']} onu=True onu_reason=omci-flows-pushed
- Run Keyword If ${has_dataplane} and '${service_type}' != 'mcast' Run Keyword And Continue On Failure
+ Run Keyword If ${has_dataplane} and '${service_type}' != 'mcast'
... Sanity Test TT one ONU ${src} ${dst} ${suppressaddsubscriber}
- ... ELSE IF ${has_dataplane} and '${service_type}' == 'mcast' Run Keyword And Continue On Failure
+ ... ELSE IF ${has_dataplane} and '${service_type}' == 'mcast'
... Sanity Test TT MCAST one ONU ${src} ${dst} ${suppressaddsubscriber}
END
diff --git a/tests/tt-workflow/Voltha_TT_PODTests.robot b/tests/tt-workflow/Voltha_TT_PODTests.robot
index fd095a9..4cded53 100755
--- a/tests/tt-workflow/Voltha_TT_PODTests.robot
+++ b/tests/tt-workflow/Voltha_TT_PODTests.robot
@@ -209,9 +209,9 @@
Wait Until Keyword Succeeds ${timeout} 5s
... Validate Device ENABLED ACTIVE
... REACHABLE ${src['onu']} onu=True onu_reason=omci-flows-pushed
- Run Keyword If ${has_dataplane} and '${service_type}' != 'mcast' Run Keyword And Continue On Failure
+ Run Keyword If ${has_dataplane} and '${service_type}' != 'mcast'
... Sanity Test TT one ONU ${src} ${dst} ${suppressaddsubscriber}
- ... ELSE IF ${has_dataplane} and '${service_type}' == 'mcast' Run Keyword And Continue On Failure
+ ... ELSE IF ${has_dataplane} and '${service_type}' == 'mcast'
... Sanity Test TT MCAST one ONU ${src} ${dst} ${suppressaddsubscriber}
END
@@ -247,9 +247,9 @@
Run Keyword If ${has_dataplane} and '${service_type}' == 'mcast' Clean Up Linux
Wait Until Keyword Succeeds ${timeout} 2s
... Verify UNI Port Is Enabled ${ONOS_SSH_IP} ${ONOS_SSH_PORT} ${src['onu']} ${src['uni_id']}
- Run Keyword If ${has_dataplane} and '${service_type}' != 'mcast' Run Keyword And Continue On Failure
+ Run Keyword If ${has_dataplane} and '${service_type}' != 'mcast'
... Sanity Test TT one ONU ${src} ${dst} ${suppressaddsubscriber}
- ... ELSE IF ${has_dataplane} and '${service_type}' == 'mcast' Run Keyword And Continue On Failure
+ ... ELSE IF ${has_dataplane} and '${service_type}' == 'mcast'
... Sanity Test TT MCAST one ONU ${src} ${dst} ${suppressaddsubscriber}
END