From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2D62725615 for ; Wed, 28 Feb 2024 07:58:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709107099; cv=none; b=dI1/T/x1WJ/09OBsxUUD0b+vHb2uYhiUlf9v360RGY27e0kvFRyZp8sVRynUIk/eKT+pdIT0PmAWVwBeLioxAovAKxQwlogUxGiyrJfVRnIwrV4jm9WefpjW+3vgaQ0M/MUilM6WnRIZCl3SusIA3iaBQVOEqWcOaVJ5KJIJXuA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709107099; c=relaxed/simple; bh=RVInYAAevUlTK4Ve5XiKXfUk9pYivffeGSjuaa7caMU=; h=Message-ID:Subject:From:To:Cc:Date:In-Reply-To:References: Content-Type:MIME-Version; b=aShWSbVUoXS0ETI2B4mqZfH6/SzP0SW60cPNjZxMiuVFq5hLIw6O+NE/rqhxEyQ6XfAHSy2WbnLXqfkRexG1DeFBXWWSoR7ud4pijjHqN3yv9wN4hNOdjoJJ3n4FVKxJkhhTw33WEkKK1VxA/2lcDQl6pph7jBmR8txVIPbWY3A= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=ccJWOkCT; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="ccJWOkCT" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4CF33C433C7; Wed, 28 Feb 2024 07:58:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1709107098; bh=RVInYAAevUlTK4Ve5XiKXfUk9pYivffeGSjuaa7caMU=; h=Subject:From:To:Cc:Date:In-Reply-To:References:From; b=ccJWOkCT3PXbOFr4spjP1SsLWHXtWYgRokZx/oFzs1siJwbQhYYzmOl1RI79MP/OB ubL10lWMK9WlFCiiDHxfrYnyz8k/l3VoWbw1fRUO4aRY+SAmwkV8CSwNrx5+AWV+TZ TDw/NLZFX/Rq34CiRTeMGMFSU2OvV8gbU++ISzjxBbGeJr3/5m3Fh+wOgRyJhOwGYH CRIMkNJHsCT0IE3kAVPzmFRxyAbixZi8JHlerl/sevISv49MruqeMsVP70Y7ly4Rje Q1R5I53KibKIXBkGDJ11bhfLRwp3WfPbghBCO/5/I3fsD1n2lcz9qXF5aYr1aYDNiv RRXaUpbb8ZTyw== Message-ID: <696f456f4815def83894812256c54e207aa46676.camel@kernel.org> Subject: Re: [PATCH mptcp-next v5 03/12] selftests: mptcp: connect: fix misaligned OK/FAIL From: Geliang Tang To: Matthieu Baerts , mptcp@lists.linux.dev Cc: Geliang Tang Date: Wed, 28 Feb 2024 15:58:12 +0800 In-Reply-To: References: <57d3e04f51798ad454f1f028cd9a59a5066f0a96.1708939962.git.tanggeliang@kylinos.cn> Autocrypt: addr=geliang@kernel.org; prefer-encrypt=mutual; keydata=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 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.50.0-1 Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 On Mon, 2024-02-26 at 13:40 +0100, Matthieu Baerts wrote: > Hi Geliang, >=20 > On 26/02/2024 10:43, Geliang Tang wrote: > > From: Geliang Tang > >=20 > > The first [ OK ] and [FAIL] in the output of mptcp_connect.sh > > misalign > > with the others: > >=20 > > New MPTCP socket can be blocked via sysctl [ OK ] > > INFO: validating network environment with pings > > INFO: Using loss of 0.85% delay 16 ms reorder 95% 70% with delay > > 4ms on > > ns1 MPTCP -> ns1 (10.0.1.1:10000=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 ) MPTCP = (duration=C2=A0=C2=A0 184ms) > > [ OK ] > > ns1 MPTCP -> ns1 (10.0.1.1:10001=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 ) TCP=C2= =A0=C2=A0 (duration=C2=A0=C2=A0=C2=A0 50ms) > > [ OK ] > > ns1 TCP=C2=A0=C2=A0 -> ns1 (10.0.1.1:10002=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0 ) MPTCP (duration=C2=A0=C2=A0=C2=A0 55ms) > > [ OK ] > >=20 > > This patch fixes them. > >=20 > > Signed-off-by: Geliang Tang > > --- > > =C2=A0tools/testing/selftests/net/mptcp/mptcp_connect.sh | 6 +++--- > > =C2=A01 file changed, 3 insertions(+), 3 deletions(-) > >=20 > > diff --git a/tools/testing/selftests/net/mptcp/mptcp_connect.sh > > b/tools/testing/selftests/net/mptcp/mptcp_connect.sh > > index ab3bb3b17522..72be905bab1f 100755 > > --- a/tools/testing/selftests/net/mptcp/mptcp_connect.sh > > +++ b/tools/testing/selftests/net/mptcp/mptcp_connect.sh > > @@ -254,7 +254,7 @@ check_mptcp_disabled() > > =C2=A0 > > =C2=A0 # net.mptcp.enabled should be enabled by default > > =C2=A0 if [ "$(ip netns exec ${disabled_ns} sysctl > > net.mptcp.enabled | awk '{ print $3 }')" -ne 1 ]; then > > - echo -e "net.mptcp.enabled sysctl is not 1 by > > default\t\t[FAIL]" > > + echo -e "net.mptcp.enabled sysctl is not 1 by > > default\t\t\t=C2=A0=C2=A0 [FAIL]" >=20 > Best to use one new helper using 'printf %-XXXs', instead of playing > with tabs and spaces. Updated. >=20 > That will also help to add colours later, with just: >=20 > =C2=A0 mptcp_lib_print_success/fail/warn Updated. >=20 > > =C2=A0 mptcp_lib_result_fail "net.mptcp.enabled sysctl is > > not 1 by default" > > =C2=A0 ret=3D1 > > =C2=A0 return 1 > > @@ -267,13 +267,13 @@ check_mptcp_disabled() > > =C2=A0 mptcp_lib_ns_exit "${disabled_ns}" > > =C2=A0 > > =C2=A0 if [ ${err} -eq 0 ]; then > > - echo -e "New MPTCP socket cannot be blocked via > > sysctl\t\t[FAIL]" > > + echo -e "New MPTCP socket cannot be blocked via > > sysctl\t\t\t=C2=A0=C2=A0 [FAIL]" > > =C2=A0 mptcp_lib_result_fail "New MPTCP socket cannot be > > blocked via sysctl" > > =C2=A0 ret=3D1 > > =C2=A0 return 1 > > =C2=A0 fi > > =C2=A0 > > - echo -e "New MPTCP socket can be blocked via sysctl\t\t[ > > OK ]" > > + echo -e "New MPTCP socket can be blocked via > > sysctl\t\t\t=C2=A0=C2=A0 [ OK ]" > > =C2=A0 mptcp_lib_result_pass "New MPTCP socket can be blocked via > > sysctl" > > =C2=A0 return 0 > > =C2=A0} >=20 > Cheers, > Matt