tests: Fix flaky "DHCP RELAY".

Give some time for pinctrl to handle the packet. Signed-off-by: Xavier Simonart <[email protected]> Signed-off-by: 0-day Robot <[email protected]>
ovsrobot · Dec 10, 2024 · ff338a6 · ff338a6
1 parent 734b7f5
commit ff338a6
Showing 1 changed file with 6 additions and 24 deletions.
diff --git a/tests/ovn.at b/tests/ovn.at
@@ -38631,10 +38631,7 @@ sid=$src_ip
 # send packet
 send_dhcp_packet $src_mac $src_ip $dst_mac $dst_ip 01 01 $yiaddr $giaddr $sid vif0
 
-ovs-ofctl dump-flows br-int table=$dhcp_relay_req_table > pflows1_dhcp_relay_req
-AT_CAPTURE_FILE([pflows1_dhcp_relay_req])
-
-AT_CHECK([cat pflows1_dhcp_relay_req | grep -v NXST | grep 255.255.255.255 | grep resubmit |
+OVS_WAIT_FOR_OUTPUT([ovs-ofctl dump-flows br-int table=$dhcp_relay_req_table | grep -v NXST | grep 255.255.255.255 | grep resubmit |
 cut -d ' ' -f5-5 | sed "s/,//"], [0], [dnl
 n_packets=1
 ])
@@ -38645,10 +38642,7 @@ giaddr=`ip_to_hex 192.168.1.1`
 # send packet
 send_dhcp_packet $src_mac $src_ip $dst_mac $dst_ip 01 01 $yiaddr $giaddr $sid vif0
 
-ovs-ofctl dump-flows br-int table=$dhcp_relay_req_table > pflows2_dhcp_relay_req
-AT_CAPTURE_FILE([pflows2_dhcp_relay_req])
-
-AT_CHECK([cat pflows2_dhcp_relay_req | grep -v NXST | grep 255.255.255.255 | grep drop |
+OVS_WAIT_FOR_OUTPUT([ovs-ofctl dump-flows br-int table=$dhcp_relay_req_table | grep -v NXST | grep 255.255.255.255 | grep drop |
 cut -d ' ' -f5-5 | sed "s/,//"], [0], [dnl
 n_packets=1
 ])
@@ -38665,10 +38659,7 @@ sid=$src_ip
 # send packet
 send_dhcp_packet $src_mac $src_ip $dst_mac $dst_ip 02 02 $yiaddr $giaddr $sid ext0
 
-ovs-ofctl dump-flows br-int table=$dhcp_relay_resp_table > pflows1_dhcp_relay_resp
-AT_CAPTURE_FILE([pflows1_dhcp_relay_resp])
-
-AT_CHECK([cat pflows1_dhcp_relay_resp | grep -v NXST | grep 172.16.1.1 | grep resubmit |
+OVS_WAIT_FOR_OUTPUT([ovs-ofctl dump-flows br-int table=$dhcp_relay_resp_table | grep -v NXST | grep 172.16.1.1 | grep resubmit |
 cut -d ' ' -f5-5 | sed "s/,//"], [0], [dnl
 n_packets=1
 ])
@@ -38678,10 +38669,7 @@ giaddr=`ip_to_hex 192.168.1.10`
 # send packet
 send_dhcp_packet $src_mac $src_ip $dst_mac $dst_ip 02 02 $yiaddr $giaddr $sid ext0
 
-ovs-ofctl dump-flows br-int table=$dhcp_relay_resp_table > pflows2_dhcp_relay_resp
-AT_CAPTURE_FILE([pflows2_dhcp_relay_resp])
-
-AT_CHECK([cat pflows2_dhcp_relay_resp | grep -v NXST | grep 172.16.1.1 | grep drop |
+OVS_WAIT_FOR_OUTPUT([ovs-ofctl dump-flows br-int table=$dhcp_relay_resp_table | grep -v NXST | grep 172.16.1.1 | grep drop |
 cut -d ' ' -f5-5 | sed "s/,//"], [0], [dnl
 n_packets=1
 ])
@@ -38694,10 +38682,7 @@ yiaddr=`ip_to_hex 192.168.2.10`
 # send packet
 send_dhcp_packet $src_mac $src_ip $dst_mac $dst_ip 02 02 $yiaddr $giaddr $sid ext0
 
-ovs-ofctl dump-flows br-int table=$dhcp_relay_resp_table > pflows2_dhcp_relay_resp
-AT_CAPTURE_FILE([pflows2_dhcp_relay_resp])
-
-AT_CHECK([cat pflows2_dhcp_relay_resp | grep -v NXST | grep 172.16.1.1 | grep drop |
+OVS_WAIT_FOR_OUTPUT([ovs-ofctl dump-flows br-int table=$dhcp_relay_resp_table | grep -v NXST | grep 172.16.1.1 | grep drop |
 cut -d ' ' -f5-5 | sed "s/,//"], [0], [dnl
 n_packets=2
 ])
@@ -38710,10 +38695,7 @@ sid=`ip_to_hex 172.16.1.100`
 # send packet
 send_dhcp_packet $src_mac $src_ip $dst_mac $dst_ip 02 02 $yiaddr $giaddr $sid ext0
 
-ovs-ofctl dump-flows br-int table=$dhcp_relay_resp_table > pflows2_dhcp_relay_resp
-AT_CAPTURE_FILE([pflows2_dhcp_relay_resp])
-
-AT_CHECK([cat pflows2_dhcp_relay_resp | grep -v NXST | grep 172.16.1.1 | grep drop |
+OVS_WAIT_FOR_OUTPUT([ovs-ofctl dump-flows br-int table=$dhcp_relay_resp_table | grep -v NXST | grep 172.16.1.1 | grep drop |
 cut -d ' ' -f5-5 | sed "s/,//"], [0], [dnl
 n_packets=3
 ])