Skip to content

Commit df1a9a1

Browse files
committed
Merge: selftests: net: use slowwait to make sure setup finished
MR: https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-10/-/merge_requests/1077 JIRA: https://issues.redhat.com/browse/RHEL-84202 JIRA: https://issues.redhat.com/browse/RHEL-83477 This MR fix 2 selftest failures during setup. Signed-off-by: Hangbin Liu <haliu@redhat.com> Approved-by: Antoine Tenart <atenart@redhat.com> Approved-by: Phil Sutter <psutter@redhat.com> Approved-by: CKI KWF Bot <cki-ci-bot+kwf-gitlab-com@redhat.com> Merged-by: Jan Stancek <jstancek@redhat.com>
2 parents baaf88d + 864a904 commit df1a9a1

File tree

2 files changed

+6
-7
lines changed

2 files changed

+6
-7
lines changed

tools/testing/selftests/net/test_vxlan_vnifiltering.sh

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -146,18 +146,17 @@ run_cmd()
146146
}
147147

148148
check_hv_connectivity() {
149-
ip netns exec $hv_1 ping -c 1 -W 1 $1 &>/dev/null
150-
sleep 1
151-
ip netns exec $hv_1 ping -c 1 -W 1 $2 &>/dev/null
149+
slowwait 5 ip netns exec $hv_1 ping -c 1 -W 1 $1 &>/dev/null
150+
slowwait 5 ip netns exec $hv_1 ping -c 1 -W 1 $2 &>/dev/null
152151

153152
return $?
154153
}
155154

156155
check_vm_connectivity() {
157-
run_cmd "ip netns exec $vm_11 ping -c 1 -W 1 10.0.10.12"
156+
slowwait 5 run_cmd "ip netns exec $vm_11 ping -c 1 -W 1 10.0.10.12"
158157
log_test $? 0 "VM connectivity over $1 (ipv4 default rdst)"
159158

160-
run_cmd "ip netns exec $vm_21 ping -c 1 -W 1 10.0.10.22"
159+
slowwait 5 run_cmd "ip netns exec $vm_21 ping -c 1 -W 1 10.0.10.22"
161160
log_test $? 0 "VM connectivity over $1 (ipv6 default rdst)"
162161
}
163162

tools/testing/selftests/net/vrf_route_leaking.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -275,7 +275,7 @@ setup_sym()
275275

276276

277277
# Wait for ip config to settle
278-
sleep 2
278+
slowwait 5 ip netns exec $h1 "${ping6}" -c1 -w1 ${H2_N2_IP6} >/dev/null 2>&1
279279
}
280280

281281
setup_asym()
@@ -370,7 +370,7 @@ setup_asym()
370370
ip -netns $r2 -6 addr add dev eth1 ${R2_N2_IP6}/64 nodad
371371

372372
# Wait for ip config to settle
373-
sleep 2
373+
slowwait 5 ip netns exec $h1 "${ping6}" -c1 -w1 ${H2_N2_IP6} >/dev/null 2>&1
374374
}
375375

376376
check_connectivity()

0 commit comments

Comments
 (0)