| Message ID | 20210520104954.25007-1-po-hsu.lin@canonical.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 25173dd4093a24e977e2af9cd5654c205bf13547 |
| Headers | show |
| Series | selftests: net: devlink_port_split.py: skip the test if no devlink device | expand |
Hello: This patch was applied to netdev/net-next.git (refs/heads/master): On Thu, 20 May 2021 18:49:54 +0800 you wrote: > When there is no devlink device, the following command will return: > $ devlink -j dev show > {dev:{}} > > This will cause IndexError when trying to access the first element > in dev of this json dataset. Use the kselftest framework skip code > to skip this test in this case. > > [...] Here is the summary with links: - selftests: net: devlink_port_split.py: skip the test if no devlink device https://git.kernel.org/netdev/net-next/c/25173dd4093a You are awesome, thank you! -- Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html
diff --git a/tools/testing/selftests/net/devlink_port_split.py b/tools/testing/selftests/net/devlink_port_split.py index 834066d..2b5d6ff 100755 --- a/tools/testing/selftests/net/devlink_port_split.py +++ b/tools/testing/selftests/net/devlink_port_split.py @@ -18,6 +18,8 @@ import sys # +# Kselftest framework requirement - SKIP code is 4 +KSFT_SKIP=4 Port = collections.namedtuple('Port', 'bus_info name') @@ -239,7 +241,11 @@ def main(cmdline=None): assert stderr == "" devs = json.loads(stdout)['dev'] - dev = list(devs.keys())[0] + if devs: + dev = list(devs.keys())[0] + else: + print("no devlink device was found, test skipped") + sys.exit(KSFT_SKIP) cmd = "devlink dev show %s" % dev stdout, stderr = run_command(cmd)
When there is no devlink device, the following command will return: $ devlink -j dev show {dev:{}} This will cause IndexError when trying to access the first element in dev of this json dataset. Use the kselftest framework skip code to skip this test in this case. Example output with this change: # selftests: net: devlink_port_split.py # no devlink device was found, test skipped ok 7 selftests: net: devlink_port_split.py # SKIP Link: https://bugs.launchpad.net/bugs/1928889 Signed-off-by: Po-Hsu Lin <po-hsu.lin@canonical.com> --- tools/testing/selftests/net/devlink_port_split.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)