* [PATCH net-next] selftests: mptcp: interpret \n as a new line
@ 2020-10-06 16:06 Matthieu Baerts
2020-10-06 16:12 ` Paolo Abeni
0 siblings, 1 reply; 6+ messages in thread
From: Matthieu Baerts @ 2020-10-06 16:06 UTC (permalink / raw)
To: Mat Martineau, Matthieu Baerts, David S. Miller, Jakub Kicinski,
Shuah Khan, Paolo Abeni
Cc: netdev, mptcp, linux-kselftest, linux-kernel
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 <matthieu.baerts@tessares.net>
---
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
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH net-next] selftests: mptcp: interpret \n as a new line
2020-10-06 16:06 [PATCH net-next] selftests: mptcp: interpret \n as a new line Matthieu Baerts
@ 2020-10-06 16:12 ` Paolo Abeni
2020-10-09 0:56 ` Jakub Kicinski
0 siblings, 1 reply; 6+ messages in thread
From: Paolo Abeni @ 2020-10-06 16:12 UTC (permalink / raw)
To: Matthieu Baerts, Mat Martineau, David S. Miller, Jakub Kicinski,
Shuah Khan
Cc: netdev, mptcp, linux-kselftest, linux-kernel
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 <matthieu.baerts@tessares.net>
Acked-by: Paolo Abeni <pabeni@redhat.com>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH net-next] selftests: mptcp: interpret \n as a new line
2020-10-06 16:12 ` Paolo Abeni
@ 2020-10-09 0:56 ` Jakub Kicinski
0 siblings, 0 replies; 6+ messages in thread
From: Jakub Kicinski @ 2020-10-09 0:56 UTC (permalink / raw)
To: Paolo Abeni
Cc: Matthieu Baerts, Mat Martineau, David S. Miller, Shuah Khan,
netdev, mptcp, linux-kselftest, linux-kernel
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 <pabeni@redhat.com>
Applied, thanks!
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH net-next] selftests: mptcp: interpret \n as a new line
2020-09-16 13:13 Matthieu Baerts
2020-09-17 8:17 ` Paolo Abeni
@ 2020-09-17 23:26 ` David Miller
1 sibling, 0 replies; 6+ messages in thread
From: David Miller @ 2020-09-17 23:26 UTC (permalink / raw)
To: matthieu.baerts
Cc: mathew.j.martineau, kuba, shuah, pabeni, dcaratti, fw, netdev,
mptcp, linux-kselftest, linux-kernel
From: Matthieu Baerts <matthieu.baerts@tessares.net>
Date: Wed, 16 Sep 2020 15:13:51 +0200
> In case of errors, this message was printed:
>
> (...)
> # read: Resource temporarily unavailable
> # client exit code 0, server 3
> # \nnetns ns1-0-BJlt5D socket stat for 10003:
> (...)
>
> Obviously, the idea was to add a new line before the socket stat and not
> print "\nnetns".
>
> Fixes: b08fbf241064 ("selftests: add test-cases for MPTCP MP_JOIN")
> Fixes: 048d19d444be ("mptcp: add basic kselftest for mptcp")
> Signed-off-by: Matthieu Baerts <matthieu.baerts@tessares.net>
Applied.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH net-next] selftests: mptcp: interpret \n as a new line
2020-09-16 13:13 Matthieu Baerts
@ 2020-09-17 8:17 ` Paolo Abeni
2020-09-17 23:26 ` David Miller
1 sibling, 0 replies; 6+ messages in thread
From: Paolo Abeni @ 2020-09-17 8:17 UTC (permalink / raw)
To: Matthieu Baerts, Mat Martineau, David S. Miller, Jakub Kicinski,
Shuah Khan, Davide Caratti, Florian Westphal
Cc: netdev, mptcp, linux-kselftest, linux-kernel
On Wed, 2020-09-16 at 15:13 +0200, Matthieu Baerts wrote:
> In case of errors, this message was printed:
>
> (...)
> # read: Resource temporarily unavailable
> # client exit code 0, server 3
> # \nnetns ns1-0-BJlt5D socket stat for 10003:
> (...)
>
> Obviously, the idea was to add a new line before the socket stat and not
> print "\nnetns".
>
> Fixes: b08fbf241064 ("selftests: add test-cases for MPTCP MP_JOIN")
> Fixes: 048d19d444be ("mptcp: add basic kselftest for mptcp")
> Signed-off-by: Matthieu Baerts <matthieu.baerts@tessares.net>
Acked-by: Paolo Abeni <pabeni@redhat.com>
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH net-next] selftests: mptcp: interpret \n as a new line
@ 2020-09-16 13:13 Matthieu Baerts
2020-09-17 8:17 ` Paolo Abeni
2020-09-17 23:26 ` David Miller
0 siblings, 2 replies; 6+ messages in thread
From: Matthieu Baerts @ 2020-09-16 13:13 UTC (permalink / raw)
To: Mat Martineau, Matthieu Baerts, David S. Miller, Jakub Kicinski,
Shuah Khan, Paolo Abeni, Davide Caratti, Florian Westphal
Cc: netdev, mptcp, linux-kselftest, linux-kernel
In case of errors, this message was printed:
(...)
# read: Resource temporarily unavailable
# client exit code 0, server 3
# \nnetns ns1-0-BJlt5D socket stat for 10003:
(...)
Obviously, the idea was to add a new line before the socket stat and not
print "\nnetns".
Fixes: b08fbf241064 ("selftests: add test-cases for MPTCP MP_JOIN")
Fixes: 048d19d444be ("mptcp: add basic kselftest for mptcp")
Signed-off-by: Matthieu Baerts <matthieu.baerts@tessares.net>
---
Notes:
This commit improves the output in selftests in case of errors, mostly
seen when modifying MPTCP code. The selftests behaviour is not changed.
That's why this patch is proposed only for net-next.
tools/testing/selftests/net/mptcp/mptcp_connect.sh | 4 ++--
tools/testing/selftests/net/mptcp/mptcp_join.sh | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/tools/testing/selftests/net/mptcp/mptcp_connect.sh b/tools/testing/selftests/net/mptcp/mptcp_connect.sh
index e4df9ba64824..2cfd87d94db8 100755
--- a/tools/testing/selftests/net/mptcp/mptcp_connect.sh
+++ b/tools/testing/selftests/net/mptcp/mptcp_connect.sh
@@ -443,9 +443,9 @@ do_transfer()
duration=$(printf "(duration %05sms)" $duration)
if [ ${rets} -ne 0 ] || [ ${retc} -ne 0 ]; then
echo "$duration [ FAIL ] client exit code $retc, server $rets" 1>&2
- echo "\nnetns ${listener_ns} socket stat for $port:" 1>&2
+ echo -e "\nnetns ${listener_ns} socket stat for ${port}:" 1>&2
ip netns exec ${listener_ns} ss -nita 1>&2 -o "sport = :$port"
- echo "\nnetns ${connector_ns} socket stat for $port:" 1>&2
+ echo -e "\nnetns ${connector_ns} socket stat for ${port}:" 1>&2
ip netns exec ${connector_ns} ss -nita 1>&2 -o "dport = :$port"
cat "$capout"
diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testing/selftests/net/mptcp/mptcp_join.sh
index f39c1129ce5f..c2943e4dfcfe 100755
--- a/tools/testing/selftests/net/mptcp/mptcp_join.sh
+++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh
@@ -176,9 +176,9 @@ do_transfer()
if [ ${rets} -ne 0 ] || [ ${retc} -ne 0 ]; then
echo " client exit code $retc, server $rets" 1>&2
- echo "\nnetns ${listener_ns} socket stat for $port:" 1>&2
+ echo -e "\nnetns ${listener_ns} socket stat for ${port}:" 1>&2
ip netns exec ${listener_ns} ss -nita 1>&2 -o "sport = :$port"
- echo "\nnetns ${connector_ns} socket stat for $port:" 1>&2
+ echo -e "\nnetns ${connector_ns} socket stat for ${port}:" 1>&2
ip netns exec ${connector_ns} ss -nita 1>&2 -o "dport = :$port"
cat "$capout"
--
2.27.0
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2020-10-09 0:56 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-10-06 16:06 [PATCH net-next] selftests: mptcp: interpret \n as a new line Matthieu Baerts
2020-10-06 16:12 ` Paolo Abeni
2020-10-09 0:56 ` Jakub Kicinski
-- strict thread matches above, loose matches on Subject: below --
2020-09-16 13:13 Matthieu Baerts
2020-09-17 8:17 ` Paolo Abeni
2020-09-17 23:26 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).