From patchwork Sat Jun 21 16:14:10 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: AdrianF X-Patchwork-Id: 65420 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id CB30EC7115C for ; Sat, 21 Jun 2025 16:17:04 +0000 (UTC) Received: from mta-64-228.siemens.flowmailer.net (mta-64-228.siemens.flowmailer.net [185.136.64.228]) by mx.groups.io with SMTP id smtpd.web10.10308.1750522617401728777 for ; Sat, 21 Jun 2025 09:16:58 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=adrian.freihofer@siemens.com header.s=fm2 header.b=woNyhmi4; spf=pass (domain: rts-flowmailer.siemens.com, ip: 185.136.64.228, mailfrom: fm-1329275-2025062116165423f71dee909afe2dad-y_i9sy@rts-flowmailer.siemens.com) Received: by mta-64-228.siemens.flowmailer.net with ESMTPSA id 2025062116165423f71dee909afe2dad for ; Sat, 21 Jun 2025 18:16:54 +0200 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; s=fm2; d=siemens.com; i=adrian.freihofer@siemens.com; h=Date:From:Subject:To:Message-ID:MIME-Version:Content-Type:Content-Transfer-Encoding:Cc:References:In-Reply-To; bh=zjNHZdteeIBoPCPP6bcWYnF0blnhFK6eWH7MYPWBbRg=; b=woNyhmi4zezM56gsWBuxcqw/LZbHGPoVehsdS+41LWDxOfLdPvmWuuJznbIxc8mTPS3u9T nDNUlHD2AIu+zhQ9M4PE+caEcXiA3LGapkldu/TjAFvTGTgG2dUJzplgDfxwrjutbhLPvl3y xRUPJqgz4COYIK7i+KvIgLsu2oetGfKaVT7qimNsoNNTNc2px72/BO+qzAtPs+jOxofF+cmh aydyc/1dAei2xQUr6GXok1KTeFb4P9+DqtfjAIOZJRsu5EzaWGttNUGI746ni5g8kTNcj+0m 0F8WCzJbcNacEPLFdwr+/RsT8k2fpeR+Jt0uJkOhhTxSvYqlD8Z0zNLA==; From: AdrianF To: openembedded-core@lists.openembedded.org Cc: Adrian Freihofer Subject: [PATCH v2 1/1] oe-selftest: devtool: split tap detection into function Date: Sat, 21 Jun 2025 18:14:10 +0200 Message-ID: <20250621161649.798992-2-adrian.freihofer@siemens.com> In-Reply-To: <20250621161649.798992-1-adrian.freihofer@siemens.com> References: <20250621161649.798992-1-adrian.freihofer@siemens.com> MIME-Version: 1.0 X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-1329275:519-21489:flowmailer List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Sat, 21 Jun 2025 16:17:04 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/219168 From: Adrian Freihofer Make the check for tap devices available as a function which can be used by other tests as well. Remove /etc/runqemu-nosudo check for tap device detection. The /etc/runqemu-nosudo file is a state file created by the runqemu-gen-tapdevs script. Tap device detection now relies only on the presence of tap interfaces, making the check more robust and not dependent on the runqemu-gen-tapdevs script, which is just one way of creating the tap interfaces. Simplify the code by removing the fallback to ifconfig if the ip command is not available. ip commands are nowadays available on all host machines. The transition from ifconfig to ip has taken place long time ago e.g. for the runqemu-gen-tapdevs script. Signed-off-by: Adrian Freihofer --- meta/lib/oeqa/selftest/cases/devtool.py | 14 ++------------ meta/lib/oeqa/utils/commands.py | 10 ++++++++++ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/meta/lib/oeqa/selftest/cases/devtool.py b/meta/lib/oeqa/selftest/cases/devtool.py index 74a7727cc00..668ed0c7876 100644 --- a/meta/lib/oeqa/selftest/cases/devtool.py +++ b/meta/lib/oeqa/selftest/cases/devtool.py @@ -16,7 +16,7 @@ import json from oeqa.selftest.case import OESelftestTestCase from oeqa.utils.commands import runCmd, bitbake, get_bb_var, create_temp_layer -from oeqa.utils.commands import get_bb_vars, runqemu, get_test_layer +from oeqa.utils.commands import get_bb_vars, runqemu, runqemu_check_taps, get_test_layer from oeqa.core.decorator import OETestTag oldmetapath = None @@ -277,18 +277,8 @@ class DevtoolTestCase(OESelftestTestCase): machine = get_bb_var('MACHINE') if not machine.startswith('qemu'): self.skipTest('This test only works with qemu machines') - if not os.path.exists('/etc/runqemu-nosudo'): + if not runqemu_check_taps(): self.skipTest('You must set up tap devices with scripts/runqemu-gen-tapdevs before running this test') - result = runCmd('PATH="$PATH:/sbin:/usr/sbin" ip tuntap show', ignore_status=True) - if result.status != 0: - result = runCmd('PATH="$PATH:/sbin:/usr/sbin" ifconfig -a', ignore_status=True) - if result.status != 0: - self.skipTest('Failed to determine if tap devices exist with ifconfig or ip: %s' % result.output) - for line in result.output.splitlines(): - if line.startswith('tap'): - break - else: - self.skipTest('No tap devices found - you must set up tap devices with scripts/runqemu-gen-tapdevs before running this test') def _test_devtool_add_git_url(self, git_url, version, pn, resulting_src_uri, srcrev=None): self.track_for_cleanup(self.workspacedir) diff --git a/meta/lib/oeqa/utils/commands.py b/meta/lib/oeqa/utils/commands.py index b60a6e6c389..5eaedd2fd96 100644 --- a/meta/lib/oeqa/utils/commands.py +++ b/meta/lib/oeqa/utils/commands.py @@ -401,6 +401,16 @@ def runqemu(pn, ssh=True, runqemuparams='', image_fstype=None, launch_cmd=None, targetlogger.removeHandler(handler) qemu.stop() +def runqemu_check_taps(): + """Check if tap devices for runqemu are available""" + result = runCmd('PATH="$PATH:/sbin:/usr/sbin" ip tuntap show', ignore_status=True) + if result.status != 0: + return False + for line in result.output.splitlines(): + if line.startswith('tap'): + return True + return False + def updateEnv(env_file): """ Source a file and update environment.