2020-10-06 16:08:24

by Matthieu Baerts

[permalink] [raw]
Subject: [PATCH net-next] selftests: mptcp: interpret \n as a new line

In case of errors, this message was printed:

(...)
balanced bwidth with unbalanced delay 5233 max 5005 [ fail ]
client exit code 0, server 0
\nnetns ns3-0-EwnkPH socket stat for 10003:
(...)

Obviously, the idea was to add a new line before the socket stat and not
print "\nnetns".

The commit 8b974778f998 ("selftests: mptcp: interpret \n as a new line")
is very similar to this one. But the modification in simult_flows.sh was
missed because this commit above was done in parallel to one here below.

Fixes: 1a418cb8e888 ("mptcp: simult flow self-tests")
Signed-off-by: Matthieu Baerts <[email protected]>
---
tools/testing/selftests/net/mptcp/simult_flows.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/testing/selftests/net/mptcp/simult_flows.sh b/tools/testing/selftests/net/mptcp/simult_flows.sh
index 0d88225daa02..2f649b431456 100755
--- a/tools/testing/selftests/net/mptcp/simult_flows.sh
+++ b/tools/testing/selftests/net/mptcp/simult_flows.sh
@@ -200,9 +200,9 @@ do_transfer()

echo " [ fail ]"
echo "client exit code $retc, server $rets" 1>&2
- echo "\nnetns ${ns3} socket stat for $port:" 1>&2
+ echo -e "\nnetns ${ns3} socket stat for $port:" 1>&2
ip netns exec ${ns3} ss -nita 1>&2 -o "sport = :$port"
- echo "\nnetns ${ns1} socket stat for $port:" 1>&2
+ echo -e "\nnetns ${ns1} socket stat for $port:" 1>&2
ip netns exec ${ns1} ss -nita 1>&2 -o "dport = :$port"
ls -l $sin $cout
ls -l $cin $sout
--
2.27.0


2020-10-06 16:14:47

by Paolo Abeni

[permalink] [raw]
Subject: Re: [PATCH net-next] selftests: mptcp: interpret \n as a new line

On Tue, 2020-10-06 at 18:06 +0200, Matthieu Baerts wrote:
> In case of errors, this message was printed:
>
> (...)
> balanced bwidth with unbalanced delay 5233 max 5005 [ fail ]
> client exit code 0, server 0
> \nnetns ns3-0-EwnkPH socket stat for 10003:
> (...)
>
> Obviously, the idea was to add a new line before the socket stat and not
> print "\nnetns".
>
> The commit 8b974778f998 ("selftests: mptcp: interpret \n as a new line")
> is very similar to this one. But the modification in simult_flows.sh was
> missed because this commit above was done in parallel to one here below.
>
> Fixes: 1a418cb8e888 ("mptcp: simult flow self-tests")
> Signed-off-by: Matthieu Baerts <[email protected]>

Acked-by: Paolo Abeni <[email protected]>

2020-10-09 01:07:45

by Jakub Kicinski

[permalink] [raw]
Subject: Re: [PATCH net-next] selftests: mptcp: interpret \n as a new line

On Tue, 06 Oct 2020 18:12:45 +0200 Paolo Abeni wrote:
> On Tue, 2020-10-06 at 18:06 +0200, Matthieu Baerts wrote:
> > In case of errors, this message was printed:
> >
> > (...)
> > balanced bwidth with unbalanced delay 5233 max 5005 [ fail ]
> > client exit code 0, server 0
> > \nnetns ns3-0-EwnkPH socket stat for 10003:
> > (...)
> >
> > Obviously, the idea was to add a new line before the socket stat and not
> > print "\nnetns".
> >
> > The commit 8b974778f998 ("selftests: mptcp: interpret \n as a new line")
> > is very similar to this one. But the modification in simult_flows.sh was
> > missed because this commit above was done in parallel to one here below.
>
> Acked-by: Paolo Abeni <[email protected]>

Applied, thanks!