From 87e234be3e708580d30c18280cdefbd22b0260fa Mon Sep 17 00:00:00 2001 From: Dave Wallace Date: Thu, 27 Oct 2016 20:23:30 +0000 Subject: [PATCH 1/1] Revert "Use 3 tries to prepare DUT for testing" This reverts commit d551ef4b72448c3ccb493559826b976a2d3d8649. Change-Id: Icff3a98b96298385a2e4789d40ef60d70f440492 Signed-off-by: Dave Wallace --- resources/libraries/robot/default.robot | 4 +--- tests/func/__init__.robot | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/resources/libraries/robot/default.robot b/resources/libraries/robot/default.robot index eeef04a8a2..238749aef1 100644 --- a/resources/libraries/robot/default.robot +++ b/resources/libraries/robot/default.robot @@ -24,9 +24,7 @@ *** Keywords *** | Setup all DUTs before test | | [Documentation] | Setup all DUTs in topology before test execution -| | ${duts}= | Get Matches | ${nodes} | DUT* -| | :FOR | ${dut} | IN | @{duts} -| | | Wait Until Keyword Succeeds | 3x | 1 min | Setup Dut | ${nodes['${dut}']} +| | Setup All DUTs | ${nodes} | Setup all TGs before traffic script | | [Documentation] | Prepare all TGs before traffic scripts execution diff --git a/tests/func/__init__.robot b/tests/func/__init__.robot index 7d3c64e78b..2016146e3b 100644 --- a/tests/func/__init__.robot +++ b/tests/func/__init__.robot @@ -16,5 +16,5 @@ | Resource | resources/libraries/robot/interfaces.robot | Library | resources.libraries.python.SetupFramework | Suite Setup | Run Keywords | Setup Framework | ${nodes} -| ... | AND | Setup all DUTs before test +| ... | AND | Setup All DUTs | ${nodes} | ... | AND | Update All Interface Data On All Nodes | ${nodes} -- 2.16.6