diff options
| author |   Matej Klotton <mklotton@cisco.com> | 2016-07-21 17:35:48 +0200 |
|---|---|---|
| committer | Matej Klotton <mklotton@cisco.com> | 2016-08-11 12:00:39 +0200 |
| commit | bc4e345605abe0772043892fcc99fce9aa768edb (patch) | |
| tree | b96876b37bab58fc4737dad607ea00d415b5bd05 | |
| parent | 72be8262ea5dc0136a21032402b7f4ffa5ff4576 (diff) | |
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 <mklotton@cisco.com>
| -rw-r--r-- | tests/func/ipv4/ipv4_arp_untagged.robot | 5 | ||||
| -rw-r--r-- | tests/func/ipv4/ipv4_proxy_arp_untagged.robot | 4 | ||||
| -rw-r--r-- | tests/func/ipv4/ipv4_untagged.robot | 5 | ||||
| -rw-r--r-- | tests/func/ipv6/ipv6_ra.robot | 5 | ||||
| -rw-r--r-- | tests/func/ipv6/ipv6_untagged.robot | 5 |
5 files changed, 15 insertions, 9 deletions
diff --git a/tests/func/ipv4/ipv4_arp_untagged.robot b/tests/func/ipv4/ipv4_arp_untagged.robot index 5bec624262..a387eed85f 100644 --- a/tests/func/ipv4/ipv4_arp_untagged.robot +++ b/tests/func/ipv4/ipv4_arp_untagged.robot @@ -25,8 +25,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 Keyword If Test Failed | Run Keywords +| ... | Show packet trace on all DUTs | ${nodes} | AND +| ... | Show vpp trace dump on all DUTs | Documentation | *IPv4 ARP test cases* | ... | ... | RFC826 ARP: Eth-IPv4 and Eth-ARP on links TG-DUT1, TG-DUT2, DUT1-DUT2: diff --git a/tests/func/ipv4/ipv4_proxy_arp_untagged.robot b/tests/func/ipv4/ipv4_proxy_arp_untagged.robot index 716a84b900..ec164d2d32 100644 --- a/tests/func/ipv4/ipv4_proxy_arp_untagged.robot +++ b/tests/func/ipv4/ipv4_proxy_arp_untagged.robot @@ -23,7 +23,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 | Show packet trace on all DUTs | ${nodes} +| Test Teardown | Run Keywords +| ... | Show packet trace on all DUTs | ${nodes} | AND +| ... | Show vpp trace dump on all DUTs | Documentation | *RFC1027 Proxy ARP test cases* | ... | ... | *[Top] Network topologies:* TG-DUT1 2-node topology with diff --git a/tests/func/ipv4/ipv4_untagged.robot b/tests/func/ipv4/ipv4_untagged.robot index 3b6716d858..b7cb9d96a9 100644 --- a/tests/func/ipv4/ipv4_untagged.robot +++ b/tests/func/ipv4/ipv4_untagged.robot @@ -23,8 +23,9 @@ | ... | AND | Update All Interface Data On All Nodes | ${nodes} | ... | AND | Setup DUT nodes for IPv4 testing | 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 | *IPv4 routing test cases* | ... | ... | RFC791 IPv4, RFC826 ARP, RFC792 ICMPv4. Encapsulations: Eth-IPv4-ICMPv4 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. |