From patchwork Thu Jul 1 08:04:42 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Po-Hsu Lin X-Patchwork-Id: 1499433 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4GFrQM0n34z9sV8; Thu, 1 Jul 2021 18:06:33 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1lyriO-0000GU-Fm; Thu, 01 Jul 2021 08:06:28 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1lyriM-0000Fy-Fg for kernel-team@lists.ubuntu.com; Thu, 01 Jul 2021 08:06:26 +0000 Received: from mail-pl1-f199.google.com ([209.85.214.199]) by youngberry.canonical.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.93) (envelope-from ) id 1lyriM-00034F-8x for kernel-team@lists.ubuntu.com; Thu, 01 Jul 2021 08:06:26 +0000 Received: by mail-pl1-f199.google.com with SMTP id x15-20020a170902e04fb02900f5295925dbso2400958plx.9 for ; Thu, 01 Jul 2021 01:06:26 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=VLWCRxT3JbQb931PzEu+AbI4PLB39fZQ4j8cJopUXfI=; b=SloKDS492uZrLrdmq93n+utSmpL73ZxzeUw5kWeBReRrDaLsxxQrg5YQvkS9y4TMFp 8OhkLQXhLmJaQuqMCT92scqL+0wz48DcA9PN2AQHVwqJRDzwQplP8/ehGJkF5wYhq9dI pcf2MgDuMmuh8kqCYzTjuFSC+fY8Jb1kFJdnr40QB+G00KgCGsSNy3Q7+WEb+s8WySsp Dqb2POYNJy+W9jGLGqPDlx0WffZKFO28+skTrXqo6n9AXvMX9vk3ecx8Novct59Hs+p6 8h7VOSUjcZawxveLNNt5eyFgT2I3DvycsHgeXDm8Gg+MYpWWjKgM1dWaJKZXEjlKUEQK PI3Q== X-Gm-Message-State: AOAM531U04/qYxF7a2knuJkCZ7gH+has2lbedtzUa8ZBJRJwsrqjKKgv 1dvK51jqZmabTNjqEJy1OqhjXOCLf8mGTlQIfXRRaGQEOytQgW0y68Z//ZNbxpKRmSw2u+9wk6H IuOE4G2eaVsNrSXUtvbrdRP6JQlftrJgZdmy75jHJ X-Received: by 2002:a65:6497:: with SMTP id e23mr7561019pgv.43.1625126784896; Thu, 01 Jul 2021 01:06:24 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyFUf2WTdf1F3+90v/B91Cez1CAHYKSjfBNnj4681jaG0nDyvOK2eXEz/kk2078tORDrkWGfA== X-Received: by 2002:a65:6497:: with SMTP id e23mr7560998pgv.43.1625126784541; Thu, 01 Jul 2021 01:06:24 -0700 (PDT) Received: from localhost.localdomain (223-137-4-103.emome-ip.hinet.net. [223.137.4.103]) by smtp.gmail.com with ESMTPSA id q18sm25407816pgj.8.2021.07.01.01.06.23 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 01 Jul 2021 01:06:23 -0700 (PDT) From: Po-Hsu Lin To: kernel-team@lists.ubuntu.com Subject: [F-oem-5.10/F-oem-5.13][H/I/Unstable][SRU][PATCH 1/1] selftests: net: devlink_port_split.py: skip the test if no devlink device Date: Thu, 1 Jul 2021 16:04:42 +0800 Message-Id: <20210701080442.52267-2-po-hsu.lin@canonical.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210701080442.52267-1-po-hsu.lin@canonical.com> References: <20210701080442.52267-1-po-hsu.lin@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" BugLink: https://bugs.launchpad.net/bugs/1928889 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 Signed-off-by: David S. Miller (cherry picked from commit 25173dd4093a24e977e2af9cd5654c205bf13547) Signed-off-by: Po-Hsu Lin --- tools/testing/selftests/net/devlink_port_split.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) 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)