X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=tests%2Ffunc%2Ftap%2Ftap_interface.robot;h=2acdad8d376144228b2e75726de59bbd2795d432;hp=13a8e619fb9fd5593101458cafd1cf1a97806a86;hb=440370de3fc66d5bb9754a55fa78ccce8c598f5d;hpb=efe5c162d2311ed470285a6f84af7c0f3a0c109c

diff --git a/tests/func/tap/tap_interface.robot b/tests/func/tap/tap_interface.robot
index 13a8e619fb..2acdad8d37 100644
--- a/tests/func/tap/tap_interface.robot
+++ b/tests/func/tap/tap_interface.robot
@@ -24,11 +24,10 @@
 | Library  | resources.libraries.python.Namespaces
 | Library  | resources.libraries.python.IPUtil
 | Force Tags | HW_ENV | VM_ENV | 3_NODE_DOUBLE_LINK_TOPO
-| Test Setup | Run Keywords | Setup all DUTs before test
-| ...        | AND          | Setup all TGs before traffic script
-| ...        | AND          | Clean Up Namespaces | ${nodes['DUT1']}
-| Test Teardown | Run Keywords | Show Packet Trace on All DUTs | ${nodes}
+| Test Setup | Run Keywords | Func Test Setup
 | ...        | AND          | Clean Up Namespaces | ${nodes['DUT1']}
+| Test Teardown | Run Keywords | Func Test Teardown
+| ...           | AND          | Clean Up Namespaces | ${nodes['DUT1']}
 | Documentation | *Tap Interface Traffic Tests*
 | ... | *[Top] Network Topologies:* TG=DUT1 2-node topology with two links
 | ... | between nodes.
@@ -91,7 +90,8 @@
 | | [Teardown] | Run Keywords
 | | ... | Linux Del Bridge | ${dut_node} | ${bid_TAP} | AND
 | | ... | Show Packet Trace on All DUTs | ${nodes} | AND
-| | ... | Clean Up Namespaces | ${nodes['DUT1']}
+| | ... | Clean Up Namespaces | ${nodes['DUT1']} | AND
+| | ... | Check VPP PID in Teardown
 | | ...
 | | Given Path for 2-node testing is set | ${nodes['TG']} | ${nodes['DUT1']}
 | | ... | ${nodes['TG']}