[PATCH mptcp-next 2/2] Squash to "selftests: mptcp: connect: use += operator to append strings"

Geliang Tang posted 2 patches 1 year, 11 months ago
[PATCH mptcp-next 2/2] Squash to "selftests: mptcp: connect: use += operator to append strings"
Posted by Geliang Tang 1 year, 11 months ago
From: Geliang Tang <tanggeliang@kylinos.cn>

Append the fallback note into 'extra' string too.

Signed-off-by: Geliang Tang <tanggeliang@kylinos.cn>
---
 tools/testing/selftests/net/mptcp/mptcp_connect.sh | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/tools/testing/selftests/net/mptcp/mptcp_connect.sh b/tools/testing/selftests/net/mptcp/mptcp_connect.sh
index 8feb4eef0931..c1733c38a2de 100755
--- a/tools/testing/selftests/net/mptcp/mptcp_connect.sh
+++ b/tools/testing/selftests/net/mptcp/mptcp_connect.sh
@@ -451,6 +451,7 @@ do_transfer()
 	mptcp_lib_check_transfer $cin $sout "file received by server"
 	rets=$?
 
+	local extra=""
 	local stat_synrx_now_l
 	local stat_ackrx_now_l
 	local stat_cookietx_now
@@ -484,7 +485,7 @@ do_transfer()
 					  "than expected (${expect_ackrx})"
 			rets=1
 		else
-			printf "[ Note ] fallback due to TCP OoO"
+			extra+=" [ Note ] fallback due to TCP OoO"
 		fi
 	fi
 
@@ -507,8 +508,6 @@ do_transfer()
 		fi
 	fi
 
-	local extra=""
-
 	if [ $cookies -eq 2 ];then
 		if [ $stat_cookietx_last -ge $stat_cookietx_now ] ;then
 			extra+=" WARN: CookieSent: did not advance"
-- 
2.40.1
Re: [PATCH mptcp-next 2/2] Squash to "selftests: mptcp: connect: use += operator to append strings"
Posted by Matthieu Baerts 1 year, 11 months ago
Hi Geliang,

On 07/03/2024 02:14, Geliang Tang wrote:
> From: Geliang Tang <tanggeliang@kylinos.cn>
> 
> Append the fallback note into 'extra' string too.

Thanks, just applied this patch 2/2 and the other one you sent today +
my suggestion:

- 853ccbd0b6df: "squashed" in "selftests: mptcp: connect: use +=
operator to append strings"
- 346ae0576b55: "squashed" in "selftests: mptcp: print test results with
colors"
- 405273a52e3c: "squashed" in "selftests: mptcp: print test results with
colors"

Tests are now in progress:

https://cirrus-ci.com/github/multipath-tcp/mptcp_net-next/export/20240307T094044

Cheers,
Matt
-- 
Sponsored by the NGI0 Core fund.