aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorJan Gelety <jgelety@cisco.com>2017-11-13 12:14:24 +0100
committerJan Gelety <jgelety@cisco.com>2017-11-14 08:49:29 +0000
commit60b38270a79c8f789a6201c52c2eb2fd8420fba4 (patch)
tree56c69d78771acd4dd523441b0b956095ab1082a1 /tests
parent175f19c60425ca5fd22519354f4419b430cbdb79 (diff)
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 <jgelety@cisco.com>
Diffstat (limited to 'tests')
-rw-r--r--tests/vpp/func/vm_vhost/l2bd/eth2p-dot1q-l2bdbasemaclrn-eth-4vhost-2vm-fds-provider-nets-func.robot7
-rw-r--r--tests/vpp/func/vm_vhost/l2bd/eth2p-ethip4vxlan-l2bdbasemaclrn--eth-4vhost-2vm-fds-tenant-nets-func.robot7
2 files changed, 6 insertions, 8 deletions
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.*
| ...