[11/41] oeqa: Drop redundant .keys() calls on dicts

Message ID	20261115084845.701136-11-richard.purdie@linuxfoundation.org
State	New
Headers	show Received: from mail-wm1-f50.google.com (mail-wm1-f50.google.com [209.85.128.50]) by mx.groups.io with SMTP id smtpd.msgproc01-g2.4322.1794732549170850980 for <openembedded-core@lists.openembedded.org>; Sun, 15 Nov 2026 00:49:09 -0800 ip: 209.85.128.50, mailfrom: richard.purdie@linuxfoundation.org) From: Richard Purdie <richard.purdie@linuxfoundation.org> To: openembedded-core@lists.openembedded.org Subject: [PATCH 11/41] oeqa: Drop redundant .keys() calls on dicts Date: Sun, 15 Nov 2026 08:48:14 +0000 Message-ID: <20261115084845.701136-11-richard.purdie@linuxfoundation.org> In-Reply-To: <20261115084845.701136-1-richard.purdie@linuxfoundation.org> References: <20261115084845.701136-1-richard.purdie@linuxfoundation.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="utf-8"
Series	[01/41] oeqa/loader: Drop code for pre python 3.5 \| expand [01/41] oeqa/loader: Drop code for pre python 3.5 [02/41] lib: Simplify super() calls [03/41] oe-buildenv-internal: Correct minimum python version [04/41] oeqa/core/utils/concurrencytest: Fix losing results after class setup failures [05/41] oeqa/core/utils/concurrencytest: Only show each test's own output [06/41] oeqa/core/utils/concurrencytest: Don't buffer output in the forwarding results [07/41] oeqa/core/utils/concurrencytest: Fix the failed count in the test progress [08/41] oeqa: Drop explicit 'object' base classes [09/41] oeqa: Use OSError instead of IOError and socket.error [10/41] oeqa: Use 'is None' for None comparisons [11/41] oeqa: Drop redundant .keys() calls on dicts [12/41] oeqa/core/context: Use isinstance() for type check [13/41] oeqa: Use bare raise to re-raise exceptions [14/41] oeqa: Let subprocess decode output instead of calling .decode() [15/41] oeqa/selftest/manifest: Remove broken/unused code [16/41] oeqa/utils/testexport.py: Drop file [17/41] oeqa/runexported.py: Remove file [18/41] oeqa/oetest.py: Remove [19/41] oeqa/lib/utils/decorators.py: Remove [20/41] oeqa/targetcontrol: Drop SimpleRemoteTarget [21/41] oeqa/core/target/ssh: Fix TimeoutExpired reference [22/41] oeqa/runtime/ltp: Share a single base class and fix tearDownClass failures [23/41] oeqa/selftest/oelib/buildhistory: Fix variable removal in commit_vars() [24/41] oeqa: Remove unused code [25/41] oeqa/core/loader: Simplify the _make_failed_test override [26/41] oeqa: Remove unused imports [27/41] oeqa/core/decorator/depends: Check resolved dependency ids when running [28/41] oeqa/core/case: Tear down decorators if setUp() fails [29/41] oeqa/core/loader: Bind a copy of each decorator per test case [30/41] oeqa/core/runner: Report the status of tests with failing subtests [31/41] oeqa/buildperf: Drop sortTestMethodsUsing from the test runner [32/41] oeqa/core/tests: Add tests for the reported test result status [33/41] oeqa/core/runner: Track test results as they are added [34/41] oeqa/core/runner: Use getSuiteCases() to list tests [35/41] oeqa/core/decorator: Record decorators on the test function [36/41] oeqa/core/tests: Add tests for skipping tests and td_vars checks [37/41] oeqa/core: Use unittest's setup hook instead of patching test classes [38/41] oeqa/core/loader: Always return a flat test suite [39/41] oeqa: Drop the unused tc_kwargs list phase and dead selftest code [40/41] oeqa: Replace tc_kwargs with explicit attributes [41/41] oeqa/selftest: Use the core executor's run()

diff --git a/meta/lib/oeqa/sdk/context.py b/meta/lib/oeqa/sdk/context.py index 891910d218c..f00e40eb6c6 100644 --- a/meta/lib/oeqa/sdk/context.py +++ b/meta/lib/oeqa/sdk/context.py @@ -34,12 +34,12 @@ class OESDKTestContext(OETestContext): if regex: # do regex match pat = re.compile(pkg) - for p in manifest.keys(): + for p in manifest: if pat.search(p): return True else: # do exact match - if pkg in manifest.keys(): + if pkg in manifest: return True return False diff --git a/meta/lib/oeqa/selftest/cases/manifest.py b/meta/lib/oeqa/selftest/cases/manifest.py index 2c103c06fe3..08b0ceca05b 100644 --- a/meta/lib/oeqa/selftest/cases/manifest.py +++ b/meta/lib/oeqa/selftest/cases/manifest.py @@ -87,7 +87,7 @@ class VerifyManifest(OESelftestTestCase): host = 'nativesdk-packagegroup-sdk-host') try: mdir = self.get_dir_from_bb_var('SDK_DEPLOY', self.buildtarget) - for k in d_target.keys(): + for k in d_target: toolchain_outputname = get_bb_var('TOOLCHAIN_OUTPUTNAME', self.buildtarget) mfilename[k] = "{}.{}.manifest".format(toolchain_outputname, k) mpath[k] = os.path.join(mdir, mfilename[k]) @@ -113,7 +113,7 @@ class VerifyManifest(OESelftestTestCase): .format(self.classname, mdir) self.fail(msg) - for k in d_target.keys(): + for k in d_target: self.logger.debug("{}: Check manifest {}".format( self.classname, m_entry[k].file)) diff --git a/meta/lib/oeqa/selftest/cases/pkgdata.py b/meta/lib/oeqa/selftest/cases/pkgdata.py index 8accf1be097..082c69f8a0d 100644 --- a/meta/lib/oeqa/selftest/cases/pkgdata.py +++ b/meta/lib/oeqa/selftest/cases/pkgdata.py @@ -129,15 +129,15 @@ class OePkgdataUtilTests(OESelftestTestCase): # Test recipe-space package name result = runCmd('oe-pkgdata-util list-pkg-files zlib-dev zlib-doc') files = splitoutput(result.output) - self.assertIn('zlib-dev', list(files.keys()), "listed pkgs. files: %s" %result.output) - self.assertIn('zlib-doc', list(files.keys()), "listed pkgs. files: %s" %result.output) + self.assertIn('zlib-dev', files, "listed pkgs. files: %s" %result.output) + self.assertIn('zlib-doc', files, "listed pkgs. files: %s" %result.output) self.assertIn(os.path.join(includedir, 'zlib.h'), files['zlib-dev']) self.assertIn(os.path.join(mandir, 'man3/zlib.3'), files['zlib-doc']) # Test runtime package name result = runCmd('oe-pkgdata-util list-pkg-files -r libz1 libz-dev') files = splitoutput(result.output) - self.assertIn('libz1', list(files.keys()), "listed pkgs. files: %s" %result.output) - self.assertIn('libz-dev', list(files.keys()), "listed pkgs. files: %s" %result.output) + self.assertIn('libz1', files, "listed pkgs. files: %s" %result.output) + self.assertIn('libz-dev', files, "listed pkgs. files: %s" %result.output) self.assertGreater(len(files['libz1']), 1) libspec = os.path.join(libdir, 'libz.so.1.*') found = False @@ -150,12 +150,12 @@ class OePkgdataUtilTests(OESelftestTestCase): # Test recipe result = runCmd('oe-pkgdata-util list-pkg-files -p zlib') files = splitoutput(result.output) - self.assertIn('zlib-dbg', list(files.keys()), "listed pkgs. files: %s" %result.output) - self.assertIn('zlib-doc', list(files.keys()), "listed pkgs. files: %s" %result.output) - self.assertIn('zlib-dev', list(files.keys()), "listed pkgs. files: %s" %result.output) - self.assertIn('zlib-staticdev', list(files.keys()), "listed pkgs. files: %s" %result.output) - self.assertIn('zlib', list(files.keys()), "listed pkgs. files: %s" %result.output) - self.assertNotIn('zlib-locale', list(files.keys()), "listed pkgs. files: %s" %result.output) + self.assertIn('zlib-dbg', files, "listed pkgs. files: %s" %result.output) + self.assertIn('zlib-doc', files, "listed pkgs. files: %s" %result.output) + self.assertIn('zlib-dev', files, "listed pkgs. files: %s" %result.output) + self.assertIn('zlib-staticdev', files, "listed pkgs. files: %s" %result.output) + self.assertIn('zlib', files, "listed pkgs. files: %s" %result.output) + self.assertNotIn('zlib-locale', files, "listed pkgs. files: %s" %result.output) # (ignore ptest, might not be there depending on config) self.assertIn(os.path.join(includedir, 'zlib.h'), files['zlib-dev']) self.assertIn(os.path.join(mandir, 'man3/zlib.3'), files['zlib-doc']) @@ -163,36 +163,36 @@ class OePkgdataUtilTests(OESelftestTestCase): # Test recipe, runtime result = runCmd('oe-pkgdata-util list-pkg-files -p zlib -r') files = splitoutput(result.output) - self.assertIn('libz-dbg', list(files.keys()), "listed pkgs. files: %s" %result.output) - self.assertIn('libz-doc', list(files.keys()), "listed pkgs. files: %s" %result.output) - self.assertIn('libz-dev', list(files.keys()), "listed pkgs. files: %s" %result.output) - self.assertIn('libz-staticdev', list(files.keys()), "listed pkgs. files: %s" %result.output) - self.assertIn('libz1', list(files.keys()), "listed pkgs. files: %s" %result.output) - self.assertNotIn('libz-locale', list(files.keys()), "listed pkgs. files: %s" %result.output) + self.assertIn('libz-dbg', files, "listed pkgs. files: %s" %result.output) + self.assertIn('libz-doc', files, "listed pkgs. files: %s" %result.output) + self.assertIn('libz-dev', files, "listed pkgs. files: %s" %result.output) + self.assertIn('libz-staticdev', files, "listed pkgs. files: %s" %result.output) + self.assertIn('libz1', files, "listed pkgs. files: %s" %result.output) + self.assertNotIn('libz-locale', files, "listed pkgs. files: %s" %result.output) self.assertIn(os.path.join(includedir, 'zlib.h'), files['libz-dev']) self.assertIn(os.path.join(mandir, 'man3/zlib.3'), files['libz-doc']) self.assertIn(os.path.join(libdir, 'libz.a'), files['libz-staticdev']) # Test recipe, unpackaged result = runCmd('oe-pkgdata-util list-pkg-files -p zlib -u') files = splitoutput(result.output) - self.assertIn('zlib-dbg', list(files.keys()), "listed pkgs. files: %s" %result.output) - self.assertIn('zlib-doc', list(files.keys()), "listed pkgs. files: %s" %result.output) - self.assertIn('zlib-dev', list(files.keys()), "listed pkgs. files: %s" %result.output) - self.assertIn('zlib-staticdev', list(files.keys()), "listed pkgs. files: %s" %result.output) - self.assertIn('zlib', list(files.keys()), "listed pkgs. files: %s" %result.output) - self.assertIn('zlib-locale', list(files.keys()), "listed pkgs. files: %s" %result.output) # this is the key one + self.assertIn('zlib-dbg', files, "listed pkgs. files: %s" %result.output) + self.assertIn('zlib-doc', files, "listed pkgs. files: %s" %result.output) + self.assertIn('zlib-dev', files, "listed pkgs. files: %s" %result.output) + self.assertIn('zlib-staticdev', files, "listed pkgs. files: %s" %result.output) + self.assertIn('zlib', files, "listed pkgs. files: %s" %result.output) + self.assertIn('zlib-locale', files, "listed pkgs. files: %s" %result.output) # this is the key one self.assertIn(os.path.join(includedir, 'zlib.h'), files['zlib-dev']) self.assertIn(os.path.join(mandir, 'man3/zlib.3'), files['zlib-doc']) self.assertIn(os.path.join(libdir, 'libz.a'), files['zlib-staticdev']) # Test recipe, runtime, unpackaged result = runCmd('oe-pkgdata-util list-pkg-files -p zlib -r -u') files = splitoutput(result.output) - self.assertIn('libz-dbg', list(files.keys()), "listed pkgs. files: %s" %result.output) - self.assertIn('libz-doc', list(files.keys()), "listed pkgs. files: %s" %result.output) - self.assertIn('libz-dev', list(files.keys()), "listed pkgs. files: %s" %result.output) - self.assertIn('libz-staticdev', list(files.keys()), "listed pkgs. files: %s" %result.output) - self.assertIn('libz1', list(files.keys()), "listed pkgs. files: %s" %result.output) - self.assertIn('libz-locale', list(files.keys()), "listed pkgs. files: %s" %result.output) # this is the key one + self.assertIn('libz-dbg', files, "listed pkgs. files: %s" %result.output) + self.assertIn('libz-doc', files, "listed pkgs. files: %s" %result.output) + self.assertIn('libz-dev', files, "listed pkgs. files: %s" %result.output) + self.assertIn('libz-staticdev', files, "listed pkgs. files: %s" %result.output) + self.assertIn('libz1', files, "listed pkgs. files: %s" %result.output) + self.assertIn('libz-locale', files, "listed pkgs. files: %s" %result.output) # this is the key one self.assertIn(os.path.join(includedir, 'zlib.h'), files['libz-dev']) self.assertIn(os.path.join(mandir, 'man3/zlib.3'), files['libz-doc']) self.assertIn(os.path.join(libdir, 'libz.a'), files['libz-staticdev'])

[11/41] oeqa: Drop redundant .keys() calls on dicts

Commit Message

Patch