From be7a3adeb79cbda021a01019a71e0d7413c34439 Mon Sep 17 00:00:00 2001 From: Ricardo Carrillo Cruz Date: Tue, 21 Nov 2017 13:34:27 +0100 Subject: [PATCH] Fix ovs integration tests initial setup (#33136) --- .../targets/openvswitch_bridge/tests/basic.yaml | 1 + .../targets/openvswitch_db/tests/basic.yaml | 10 +++++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/test/integration/targets/openvswitch_bridge/tests/basic.yaml b/test/integration/targets/openvswitch_bridge/tests/basic.yaml index b8e859b34ed..7cdeeda1555 100644 --- a/test/integration/targets/openvswitch_bridge/tests/basic.yaml +++ b/test/integration/targets/openvswitch_bridge/tests/basic.yaml @@ -2,6 +2,7 @@ - name: Make sure test bridge does not exist before tests command: ovs-vsctl del-br br-test + ignore_errors: yes - name: Create bridge openvswitch_bridge: diff --git a/test/integration/targets/openvswitch_db/tests/basic.yaml b/test/integration/targets/openvswitch_db/tests/basic.yaml index d0c906b95e9..fcc14410ebd 100644 --- a/test/integration/targets/openvswitch_db/tests/basic.yaml +++ b/test/integration/targets/openvswitch_db/tests/basic.yaml @@ -1,6 +1,11 @@ --- -- command: ovs-vsctl add-br br-test +- name: Make sure test bridge does not exist before tests + command: ovs-vsctl del-br br-test + ignore_errors: yes + +- name: Create test bridge + command: ovs-vsctl add-br br-test - name: Create bridge openvswitch_db: @@ -81,3 +86,6 @@ - assert: that: - "result.changed == false" + +- name: Tear down test bridge + command: ovs-vsctl del-br br-test