From bc4e345605abe0772043892fcc99fce9aa768edb Mon Sep 17 00:00:00 2001 From: Matej Klotton Date: Thu, 21 Jul 2016 17:35:48 +0200 Subject: Fix test teardown in IPv4 and IPv6 tests Run keyword if test fail expect one keyword. Test Teardown is moved to suites __init__.robot Change-Id: Ie1e4c4a803325ade4d326f9bb1a9c43a33395566 Signed-off-by: Matej Klotton --- tests/func/ipv6/ipv6_ra.robot | 5 +++-- tests/func/ipv6/ipv6_untagged.robot | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) (limited to 'tests/func/ipv6') diff --git a/tests/func/ipv6/ipv6_ra.robot b/tests/func/ipv6/ipv6_ra.robot index cf6d09ef8e..294e8c54b2 100644 --- a/tests/func/ipv6/ipv6_ra.robot +++ b/tests/func/ipv6/ipv6_ra.robot @@ -26,8 +26,9 @@ | Suite Setup | Run Keywords | Setup all TGs before traffic script | ... | AND | Update All Interface Data On All Nodes | ${nodes} | Test Setup | Setup all DUTs before test -| Test Teardown | Run Keywords | Show packet trace on all DUTs | ${nodes} -| ... | AND | Show vpp trace dump on all DUTs +| Test Teardown | Run Keywords +| ... | Show packet trace on all DUTs | ${nodes} | AND +| ... | Show vpp trace dump on all DUTs | Documentation | *IPv6 Router Advertisement test cases* | ... | ... | RFC4861 Neighbor Discovery. Encapsulations: Eth-IPv6-RA on links diff --git a/tests/func/ipv6/ipv6_untagged.robot b/tests/func/ipv6/ipv6_untagged.robot index 8557182a5f..8814cf3eae 100644 --- a/tests/func/ipv6/ipv6_untagged.robot +++ b/tests/func/ipv6/ipv6_untagged.robot @@ -24,8 +24,9 @@ | ... | AND | Vpp nodes setup ipv6 routing | ${nodes} | ${nodes_ipv6_addr} | ... | AND | Setup all TGs before traffic script | Test Setup | Clear interface counters on all vpp nodes in topology | ${nodes} -| Test Teardown | Run Keyword If Test Failed | Show packet trace on all DUTs | ${nodes} -| ... | AND | Show vpp trace dump on all DUTs +| Test Teardown | Run Keywords +| ... | Show packet trace on all DUTs | ${nodes} | AND +| ... | Show vpp trace dump on all DUTs | Documentation | *IPv6 routing test cases* | ... | ... | RFC2460 IPv6, RFC4443 ICMPv6, RFC4861 Neighbor Discovery. -- cgit 1.2.3-korg