The rename test waits for the interface to be renamed in the system,
but it doesn't mean that OVS processed the change yet. So, the test
sometimes fails on slow systems when ovs-vswitchd didn't hit the
error at the time of checking.
Need to wait for the error to be populated in the database.
Fixes: 47520b33bdf8 ("ofproto-dpif: Fix removal of renamed datapath ports.")
Signed-off-by: Ilya Maximets <[email protected]>
---
tests/system-interface.at | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/tests/system-interface.at b/tests/system-interface.at
index ff5930a97..e50ab8e07 100644
--- a/tests/system-interface.at
+++ b/tests/system-interface.at
@@ -150,6 +150,7 @@ dnl Wait for the port to be detached from the OVS datapath.
OVS_WAIT_UNTIL([ip link show | grep "ovs-new-port" | grep -v "ovs-system"])
dnl Check that database indicates the error.
+AT_CHECK([ovs-vsctl wait-until interface ovs-veth0 error!='[[]]'])
AT_CHECK([ovs-vsctl get interface ovs-veth0 error], [0], [dnl
"could not open network device ovs-veth0 (No such device)"
])
@@ -165,9 +166,7 @@ AT_CHECK([ip l set ovs-new-port name ovs-veth0])
OVS_WAIT_UNTIL([ip link show | grep -q "ovs-veth0.* ovs-system "])
-AT_CHECK([ovs-vsctl get interface ovs-veth0 error], [0], [dnl
-[[]]
-])
+AT_CHECK([ovs-vsctl wait-until interface ovs-veth0 error='[[]]'])
AT_CHECK([ovs-appctl dpctl/show | grep port], [0], [dnl
port 0: ovs-system (internal)
--
2.54.0
_______________________________________________
dev mailing list
[email protected]
https://mail.openvswitch.org/mailman/listinfo/ovs-dev
