From 60b38270a79c8f789a6201c52c2eb2fd8420fba4 Mon Sep 17 00:00:00 2001 From: Jan Gelety Date: Mon, 13 Nov 2017 12:14:24 +0100 Subject: FIX: Tear down FDS functional test - use standard Tear down functional test as part of tear down for FDS tests Change-Id: I8540683cd9c817445461cc596821fe797c1636c5 Signed-off-by: Jan Gelety --- ...ot1q-l2bdbasemaclrn-eth-4vhost-2vm-fds-provider-nets-func.robot | 7 +++---- ...vxlan-l2bdbasemaclrn--eth-4vhost-2vm-fds-tenant-nets-func.robot | 7 +++---- 2 files changed, 6 insertions(+), 8 deletions(-) (limited to 'tests/vpp') diff --git a/tests/vpp/func/vm_vhost/l2bd/eth2p-dot1q-l2bdbasemaclrn-eth-4vhost-2vm-fds-provider-nets-func.robot b/tests/vpp/func/vm_vhost/l2bd/eth2p-dot1q-l2bdbasemaclrn-eth-4vhost-2vm-fds-provider-nets-func.robot index 6bf594c0df..e652ac44d0 100644 --- a/tests/vpp/func/vm_vhost/l2bd/eth2p-dot1q-l2bdbasemaclrn-eth-4vhost-2vm-fds-provider-nets-func.robot +++ b/tests/vpp/func/vm_vhost/l2bd/eth2p-dot1q-l2bdbasemaclrn-eth-4vhost-2vm-fds-provider-nets-func.robot @@ -18,15 +18,14 @@ | Resource | resources/libraries/robot/shared/testing_path.robot | Resource | resources/libraries/robot/vm/double_qemu_setup.robot | Resource | resources/libraries/robot/vm/qemu.robot -| Resource | resources/libraries/robot/fds/default.robot | Library | resources.libraries.python.Trace | ... | Force Tags | HW_ENV | VM_ENV | SKIP_PATCH | ... -| Test Setup | Set up FDS functional test | ${nodes} +| Test Setup | Set up functional test | ... -| Test Teardown | Tear down FDS functional test | ${nodes} -| ... | ${dut1_node} | ${qemu_node1} | ${dut2_node} | ${qemu_node2} +| Test Teardown | Tear down FDS functional test | ${dut1_node} | ${qemu_node1} +| ... | ${dut2_node} | ${qemu_node2} | ... | Documentation | *Provider network FDS related.* | ... diff --git a/tests/vpp/func/vm_vhost/l2bd/eth2p-ethip4vxlan-l2bdbasemaclrn--eth-4vhost-2vm-fds-tenant-nets-func.robot b/tests/vpp/func/vm_vhost/l2bd/eth2p-ethip4vxlan-l2bdbasemaclrn--eth-4vhost-2vm-fds-tenant-nets-func.robot index e58e6ed7c2..2d81d3b592 100644 --- a/tests/vpp/func/vm_vhost/l2bd/eth2p-ethip4vxlan-l2bdbasemaclrn--eth-4vhost-2vm-fds-tenant-nets-func.robot +++ b/tests/vpp/func/vm_vhost/l2bd/eth2p-ethip4vxlan-l2bdbasemaclrn--eth-4vhost-2vm-fds-tenant-nets-func.robot @@ -18,15 +18,14 @@ | Resource | resources/libraries/robot/shared/testing_path.robot | Resource | resources/libraries/robot/vm/double_qemu_setup.robot | Resource | resources/libraries/robot/vm/qemu.robot -| Resource | resources/libraries/robot/fds/default.robot | Library | resources.libraries.python.Trace | ... | Force Tags | HW_ENV | VM_ENV | SKIP_PATCH | ... -| Test Setup | Set up FDS functional test | ${nodes} +| Test Setup | Set up functional test | ... -| Test Teardown | Tear down FDS functional test | ${nodes} -| ... | ${dut1_node} | ${qemu_node1} | ${dut2_node} | ${qemu_node2} +| Test Teardown | Tear down FDS functional test | ${dut1_node} | ${qemu_node1} +| ... | ${dut2_node} | ${qemu_node2} | ... | Documentation | *Tenant network FDS related.* | ... -- cgit 1.2.3-korg