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

Commit Message

Geliang Tang March 7, 2024, 1:14 a.m. UTC

From: Geliang Tang <[e-mail]>

Append the fallback note into 'extra' string too.

Signed-off-by: Geliang Tang <[e-mail]>
---
 tools/testing/selftests/net/mptcp/mptcp_connect.sh | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

Comments

MPTCP CI March 7, 2024, 2:04 a.m. UTC | #1

Hi Geliang,

Thank you for your modifications, that's great!

Our CI (GitHub Action) did some validations and here is its report:

- KVM Validation: normal:
  - Success! ✅:
  - Task: https://github.com/multipath-tcp/mptcp_net-next/actions/runs/8181456175

Initiator: Patchew Applier
Commits: https://github.com/multipath-tcp/mptcp_net-next/commits/a61bf0e8b8fd


If there are some issues, you can reproduce them using the same environment as
the one used by the CI thanks to a docker image, e.g.:

    $ cd [kernel source code]
    $ docker run -v "${PWD}:${PWD}:rw" -w "${PWD}" --privileged --rm -it \
        --pull always mptcp/mptcp-upstream-virtme-docker:latest \
        auto-normal

For more details:

    https://github.com/multipath-tcp/mptcp-upstream-virtme-docker


Please note that despite all the efforts that have been already done to have a
stable tests suite when executed on a public CI like here, it is possible some
reported issues are not due to your modifications. Still, do not hesitate to
help us improve that ;-)

Cheers,
MPTCP GH Action bot
Bot operated by Matthieu Baerts (NGI0 Core)

MPTCP CI March 7, 2024, 3:29 a.m. UTC | #2

Hi Geliang,

Thank you for your modifications, that's great!

Our CI (Cirrus) did some validations with a debug kernel and here is its report:

- KVM Validation: debug (except selftest_mptcp_join):
  - Unstable: 1 failed test(s): packetdrill_mp_join 

Matthieu Baerts March 7, 2024, 9:42 a.m. UTC | #3

Hi Geliang,

On 07/03/2024 02:14, Geliang Tang wrote:
> From: Geliang Tang <[e-mail]>
> 
> 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

Patch

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"