From patchwork Thu May 20 10:49:54 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: 443871 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7A893C43460 for ; Thu, 20 May 2021 10:52:40 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 6389461184 for ; Thu, 20 May 2021 10:52:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236710AbhETKx5 (ORCPT ); Thu, 20 May 2021 06:53:57 -0400 Received: from youngberry.canonical.com ([91.189.89.112]:33760 "EHLO youngberry.canonical.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239079AbhETKvj (ORCPT ); Thu, 20 May 2021 06:51:39 -0400 Received: from mail-pf1-f198.google.com ([209.85.210.198]) by youngberry.canonical.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.93) (envelope-from ) id 1ljgFs-0004Ev-Oa for netdev@vger.kernel.org; Thu, 20 May 2021 10:50:16 +0000 Received: by mail-pf1-f198.google.com with SMTP id l199-20020a6288d00000b02902db317806d5so7966379pfd.18 for ; Thu, 20 May 2021 03:50:16 -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:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=oSIkOsI8pThklktnXX4z9cUIRN7lX3KR2qCGDTjhrNQ=; b=Tp5wO8Rgex2xLQrQOL9ckheiByp4kNc4rCudcUvj+uGy2HzvdvmnfElwSHY4DP+WH1 o5CPgetRtkjBjnrtNmIRA1yMN/rrlT6HVGs+oOijpDMXNtZZ0aVgI0jSuUJcfnjOyGfC vHrcubo4TfgOUTwzYef67iDwLSt1RoAStLIZ8JmAFiUPQllsRaJpy9aHHyGxBvTHS4kH yWh4GvN0vCdb0doDW5c+rEeEsnR351C4jl+/qhJs/3h3Qh/zYU+EgXwpX6Ov47nq5A7A 2s/Qm54VPwSm0Sdr4p0SNHRrUV6LxS9EBq9ONh3pTjImzQ86xSEPgTHAwYGajwsy0XL4 4OLw== X-Gm-Message-State: AOAM530WDabolyPh+yCoBBV8yCVemSX3lJdR4ZxTDECxo42vvdECwYPg UXWeN/coybTZ4EmnQCxLc5a5QzHfdDEFSLHBGPhL7kOR7aPH5Dr6nUtKxV46OrKOCE5ip2qU87n oH2fURFWBaU8UdLS5GwGB0UJHTmFoJ+dw X-Received: by 2002:a63:617:: with SMTP id 23mr4009272pgg.409.1621507815425; Thu, 20 May 2021 03:50:15 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzwn7XUCN2dSuQXAeNGr6FMEIaM7LGBpuYtyC006hVb4wQ637WWz+UKG8DjSlSmjgdfmCFSng== X-Received: by 2002:a63:617:: with SMTP id 23mr4009249pgg.409.1621507815112; Thu, 20 May 2021 03:50:15 -0700 (PDT) Received: from localhost.localdomain (223-136-144-189.emome-ip.hinet.net. [223.136.144.189]) by smtp.gmail.com with ESMTPSA id q24sm1852614pgb.19.2021.05.20.03.50.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 May 2021 03:50:14 -0700 (PDT) From: Po-Hsu Lin To: linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, netdev@vger.kernel.org Cc: po-hsu.lin@canonical.com, shuah@kernel.org, kuba@kernel.org, davem@davemloft.net, skhan@linuxfoundation.org Subject: [PATCH] selftests: net: devlink_port_split.py: skip the test if no devlink device Date: Thu, 20 May 2021 18:49:54 +0800 Message-Id: <20210520104954.25007-1-po-hsu.lin@canonical.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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 --- 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)