7:47 a.m.
Just to improve a bit what is displayed, nothing important but this is tested
with the last version, variables names have not changed :)
Matthieu Baerts (2):
selftests: mptcp: track duration in ms
selftests: mptcp: fix alignment 2 first tests
tools/testing/selftests/net/mptcp/mptcp_connect.sh | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
--
2.20.1
7:47 a.m.
New subject: [PATCH 1/2] selftests: mptcp: track duration in ms
I was mostly seeing 0/1s. Now it is in ms, 5 digits (up to 99 seconds).
(10.0.1.1:10000) MPTCP (duration 201ms) [ OK ]
(10.0.1.1:10001) TCP (duration 161ms) [ OK ]
(10.0.1.1:10002) MPTCP (duration 174ms) [ OK ]
(10.0.1.2:10003) MPTCP (duration 178ms) [ OK ]
(10.0.2.1:10004) MPTCP (duration 162ms) [ OK ]
(10.0.2.2:10005) MPTCP (duration 174ms) [ OK ]
(10.0.3.2:10006) MPTCP (duration 172ms) [ OK ]
(10.0.3.1:10007) MPTCP (duration 201ms) [ OK ]
(10.0.1.1:10008) MPTCP (duration 170ms) [ OK ]
(10.0.2.2:10009) MPTCP (duration 170ms) [ OK ]
(10.0.3.2:10010) MPTCP (duration 371ms) [ OK ]
(10.0.3.1:10011) MPTCP (duration 178ms) [ OK ]
(10.0.1.1:10012) MPTCP (duration 170ms) [ OK ]
(10.0.1.2:10013) MPTCP (duration 1201ms) [ OK ]
(10.0.2.1:10014) MPTCP (duration 168ms) [ OK ]
(10.0.3.1:10015) MPTCP (duration 166ms) [ OK ]
(10.0.1.1:10016) MPTCP (duration 177ms) [ OK ]
(10.0.1.2:10017) MPTCP (duration 180ms) [ OK ]
(10.0.2.1:10018) MPTCP (duration 169ms) [ OK ]
(10.0.2.2:10019) MPTCP (duration 166ms) [ OK ]
(10.0.3.2:10020) MPTCP (duration 166ms) [ OK ]
Signed-off-by: Matthieu Baerts <matthieu.baerts(a)tessares.net>
---
Notes:
To squash in "mptcp: add basic kselftest for mptcp"
tools/testing/selftests/net/mptcp/mptcp_connect.sh | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/tools/testing/selftests/net/mptcp/mptcp_connect.sh
b/tools/testing/selftests/net/mptcp/mptcp_connect.sh
index fbebb4cbd3fa..71073408e63b 100755
--- a/tools/testing/selftests/net/mptcp/mptcp_connect.sh
+++ b/tools/testing/selftests/net/mptcp/mptcp_connect.sh
@@ -324,7 +324,7 @@ do_transfer()
sleep 1
- start=$(date +%s)
+ start=$(date +%s%3N)
ip netns exec ${connector_ns} ./mptcp_connect -t $timeout -p $port -s ${cl_proto}
$connect_addr < "$cin" > "$cout" &
cpid=$!
@@ -333,7 +333,7 @@ do_transfer()
wait $spid
rets=$?
- stop=$(date +%s)
+ stop=$(date +%s%3N)
if $capture; then
sleep 1
@@ -341,7 +341,7 @@ do_transfer()
fi
duration=$((stop-start))
- duration=$(printf "(duration %03ss)" $duration)
+ 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
--
2.20.1
7:47 a.m.
New subject: [PATCH 2/2] selftests: mptcp: fix alignment 2 first tests
Instead of:
New MPTCP socket can be blocked via sysctl [ OK ]
setsockopt(..., TCP_ULP, "mptcp", ...) blocked [ OK ]
We now have:
New MPTCP socket can be blocked via sysctl [ OK ]
setsockopt(..., TCP_ULP, "mptcp", ...) blocked [ OK ]
Yes, a detail but it is more visible that there are two tests at the
beginning.
Signed-off-by: Matthieu Baerts <matthieu.baerts(a)tessares.net>
---
Notes:
To squash in "mptcp: add basic kselftest for mptcp"
tools/testing/selftests/net/mptcp/mptcp_connect.sh | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/tools/testing/selftests/net/mptcp/mptcp_connect.sh
b/tools/testing/selftests/net/mptcp/mptcp_connect.sh
index 71073408e63b..b5367fe2c6ea 100755
--- a/tools/testing/selftests/net/mptcp/mptcp_connect.sh
+++ b/tools/testing/selftests/net/mptcp/mptcp_connect.sh
@@ -231,7 +231,7 @@ check_mptcp_disabled()
# net.mptcp.enabled should be enabled by default
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[ FAIL ]"
+ echo -e "net.mptcp.enabled sysctl is not 1 by default\t\t[ FAIL ]"
ret=1
return 1
fi
@@ -243,12 +243,12 @@ check_mptcp_disabled()
ip netns delete ${disabled_ns}
if [ ${err} -eq 0 ]; then
- echo -e "New MPTCP socket cannot be blocked via sysctl\t[ FAIL ]"
+ echo -e "New MPTCP socket cannot be blocked via sysctl\t\t[ FAIL ]"
ret=1
return 1
fi
- echo -e "New MPTCP socket can be blocked via sysctl\t[ OK ]"
+ echo -e "New MPTCP socket can be blocked via sysctl\t\t[ OK ]"
return 0
}
--
2.20.1
6:23 p.m.
On Sat, 26 Oct 2019, Matthieu Baerts wrote:
Just to improve a bit what is displayed, nothing important but this
is tested
with the last version, variables names have not changed :)
Matthieu Baerts (2):
selftests: mptcp: track duration in ms
selftests: mptcp: fix alignment 2 first tests
tools/testing/selftests/net/mptcp/mptcp_connect.sh | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
I like the formatting tweaks, patches look good.
--
Mat Martineau
Intel
3:53 p.m.
Hi Mat,
On 28/10/2019 19:23, Mat Martineau wrote:
On Sat, 26 Oct 2019, Matthieu Baerts wrote:
> Just to improve a bit what is displayed, nothing important but this is
> tested
> with the last version, variables names have not changed :)
>
> Matthieu Baerts (2):
> selftests: mptcp: track duration in ms
> selftests: mptcp: fix alignment 2 first tests
>
> tools/testing/selftests/net/mptcp/mptcp_connect.sh | 12 ++++++------
> 1 file changed, 6 insertions(+), 6 deletions(-)
>
I like the formatting tweaks, patches look good.
Thank you for the review:
- 10af3650daf3: "squashed" patch 1/2 in "mptcp: add basic kselftest for
mptcp"
- e797ffe3c22e: "squashed" patch 2/2 in "mptcp: add basic kselftest for
mptcp"
- already has signed-off
- 663eb10b8a4f..46bbb9476623: result
Cheers,
Matt
--
Matthieu Baerts | R&D Engineer
matthieu.baerts(a)tessares.net
Tessares SA | Hybrid Access Solutions
www.tessares.net
1 Avenue Jean Monnet, 1348 Louvain-la-Neuve, Belgium
968
days inactive
973
days old
4 comments
2 participants
participants (2)
-
Mat Martineau -
Matthieu Baerts