kselftests/net: adapt the timeout to the largest runtime

Commit Message

Zhijian Li (Fujitsu) Jan. 13, 2022, 7:28 a.m. UTC

timeout in settings is used by each case under the same directory, so
it should adapt to the maximum runtime.

A normally running net/fib_nexthops.sh may be killed by this unsuitable
timeout. Furthermore, since the defect[1] of kselftests framework,
net/fib_nexthops.sh which might take at least (300 * 4) seconds would
block the whole kselftests framework previously.
$ git grep -w 'sleep 300' tools/testing/selftests/net
tools/testing/selftests/net/fib_nexthops.sh:    sleep 300
tools/testing/selftests/net/fib_nexthops.sh:    sleep 300
tools/testing/selftests/net/fib_nexthops.sh:    sleep 300
tools/testing/selftests/net/fib_nexthops.sh:    sleep 300

Enlarge the timeout by plus 300 based on the obvious largest runtime
to avoid the blocking.

[1]: https://www.spinics.net/lists/kernel/msg4185370.html

Signed-off-by: Zhou Jie <[e-mail]>
Signed-off-by: Li Zhijian <[e-mail]>
---
 tools/testing/selftests/net/settings | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

[e-mail] Jan. 13, 2022, 1 p.m. UTC | #1

Hello:

This patch was applied to netdev/net.git (master)
by David S. Miller <[e-mail]>:

On Thu, 13 Jan 2022 15:28:59 +0800 you wrote:
> timeout in settings is used by each case under the same directory, so
> it should adapt to the maximum runtime.
> 
> A normally running net/fib_nexthops.sh may be killed by this unsuitable
> timeout. Furthermore, since the defect[1] of kselftests framework,
> net/fib_nexthops.sh which might take at least (300 * 4) seconds would
> block the whole kselftests framework previously.
> $ git grep -w 'sleep 300' tools/testing/selftests/net
> tools/testing/selftests/net/fib_nexthops.sh:    sleep 300
> tools/testing/selftests/net/fib_nexthops.sh:    sleep 300
> tools/testing/selftests/net/fib_nexthops.sh:    sleep 300
> tools/testing/selftests/net/fib_nexthops.sh:    sleep 300
> 
> [...]

Here is the summary with links:
  - kselftests/net: adapt the timeout to the largest runtime
    https://git.kernel.org/netdev/net/c/de0e444706ed

You are awesome, thank you!

Patch

diff --git a/tools/testing/selftests/net/settings b/tools/testing/selftests/net/settings
index 694d70710ff0..dfc27cdc6c05 100644
--- a/tools/testing/selftests/net/settings
+++ b/tools/testing/selftests/net/settings
@@ -1 +1 @@ 
-timeout=300
+timeout=1500