diff mbox series

[net-next,2/2] Squash-to: "mptcp: simult flow self-tests"

Message ID 37125cecdccab9bd6d83c0cd0d901b2e5cae07a6.1599659504.git.pabeni@redhat.com
State Accepted, archived
Commit d7cc2da649bc0ff327623d1550f3e55e9b2f890d
Delegated to: Matthieu Baerts
Headers show
Series [net-next,1/2] Squash-to: "mptcp: allow picking different xmit subflows" | expand

Commit Message

Paolo Abeni Sept. 9, 2020, 1:52 p.m. UTC 
Tune a bit the timing parameters, comment-out unbalanced bwidth test
cases and enable simult self-tests - should pass now.

Signed-off-by: Paolo Abeni <pabeni@redhat.com>
---
 tools/testing/selftests/net/mptcp/Makefile        |  3 ++-
 tools/testing/selftests/net/mptcp/simult_flows.sh | 13 ++++++++-----
 2 files changed, 10 insertions(+), 6 deletions(-)

Comments

Matthieu Baerts Sept. 11, 2020, 10:49 a.m. UTC | #1 
Hi Paolo,

On 09/09/2020 15:52, Paolo Abeni wrote:
> Tune a bit the timing parameters, comment-out unbalanced bwidth test
> cases and enable simult self-tests - should pass now.

Thank you for the patch!

- d7cc2da649bc: "squashed" patch 2/2 in "mptcp: simult flow self-tests"
- 4822f58422e9..895b3d8264e8: result

Tests + export will be started soon (after having applied your other 
patches)

Cheers,
Matt
diff mbox series

Patch

diff --git a/tools/testing/selftests/net/mptcp/Makefile b/tools/testing/selftests/net/mptcp/Makefile
index aa254aefc2c3..00bb158b4a5d 100644
--- a/tools/testing/selftests/net/mptcp/Makefile
+++ b/tools/testing/selftests/net/mptcp/Makefile
@@ -5,7 +5,8 @@  KSFT_KHDR_INSTALL := 1
 
 CFLAGS =  -Wall -Wl,--no-as-needed -O2 -g  -I$(top_srcdir)/usr/include
 
-TEST_PROGS := mptcp_connect.sh pm_netlink.sh mptcp_join.sh diag.sh
+TEST_PROGS := mptcp_connect.sh pm_netlink.sh mptcp_join.sh diag.sh \
+	      simult_flows.sh
 
 TEST_GEN_FILES = mptcp_connect pm_nl_ctl
 
diff --git a/tools/testing/selftests/net/mptcp/simult_flows.sh b/tools/testing/selftests/net/mptcp/simult_flows.sh
index 487a7f88ed05..0d88225daa02 100755
--- a/tools/testing/selftests/net/mptcp/simult_flows.sh
+++ b/tools/testing/selftests/net/mptcp/simult_flows.sh
@@ -239,8 +239,9 @@  run_test()
 	# time is measure in ms
 	local time=$((size * 8 * 1000 / (( $rate1 + $rate2) * 1024 *1024) ))
 
-	# mptcp_connect will sleep a bit to allow for mp_join completion
-	time=$((time + 1000))
+	# mptcp_connect will do some sleeps to allow the mp_join handshake
+	# completion
+	time=$((time + 1350))
 
 	printf "%-50s" "$msg"
 	do_transfer $small $large $((time * 11 / 10))
@@ -284,7 +285,9 @@  done
 setup
 run_test 10 10 0 0 "balanced bwidth"
 run_test 10 10 1 50 "balanced bwidth with unbalanced delay"
-run_test 30 10 0 0 "unbalanced bwidth"
-run_test 30 10 1 50 "unbalanced bwidth with unbalanced delay"
-run_test 30 10 50 1 "unbalanced bwidth with opposed, unbalanced delay"
+
+# we still need some additional infrastructure to pass the following test-cases
+# run_test 30 10 0 0 "unbalanced bwidth"
+# run_test 30 10 1 50 "unbalanced bwidth with unbalanced delay"
+# run_test 30 10 50 1 "unbalanced bwidth with opposed, unbalanced delay"
 exit $ret