diff mbox series

[12/23] testimage: inline updateTestData()

Message ID	20220331182915.22128-12-ross.burton@arm.com
State	Accepted, archived
Commit	2dfe2f68307a441fff2f5018408558bca63f7d03
Headers	show Return-Path: <ross@burtonini.com> ip: 217.140.110.172, mailfrom: ross.burton@arm.com) From: Ross Burton <ross.burton@arm.com> To: openembedded-core@lists.openembedded.org Subject: [PATCH 12/23] testimage: inline updateTestData() Date: Thu, 31 Mar 2022 19:29:04 +0100 Message-Id: <20220331182915.22128-12-ross.burton@arm.com> In-Reply-To: <20220331182915.22128-1-ross.burton@arm.com> References: <20220331182915.22128-1-ross.burton@arm.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable
Series	[01/23] buildtools-tarball: include nativesdk-python3-pyyaml \| expand [01/23] buildtools-tarball: include nativesdk-python3-pyyaml [02/23] image_types: hddimg and iso only work on x86 [03/23] oeqa/selftest/devtool: ensure Git username is set before upgrade tests [04/23] oeqa/selftest/wic: use os.rename instead of bb.utils.rename [05/23] oeqa/selftest/wic: remove redundant asserts [06/23] oeqa/selftest/wic: clean up only_for_arch decorator [07/23] oeqa/selftest/wic: don't hardcode kernel image type in test_wic_rm [08/23] oeqa/selftest/wic: add more arch-specific annotations [09/23] oeqa/selftest/buildoptions: set PACKAGE_CLASSES in test_arch_work_dir_and_export_source [10/23] oeqa/runtime/decorator/package.py: remove use of strToSet [11/23] oeqa/core/decorator: remove redundant code [12/23] testimage: inline updateTestData() [13/23] oeqa/core/utils/misc: remove redundant file [14/23] oeqa/selftest: remove unused imports [15/23] oeqa/core/decorators/data: improve has_* logic [16/23] oeqa/selftest: tag tests that use runqemu [17/23] oeqa: rationalise skipifqemu decorators [18/23] oeqa/selftest/oescripts: refactor skipping logic [19/23] oeqa/selftest/wic: cleanup WicTestCase.setUpLocal [20/23] oeqa/selftest/wic: rearrange tests [21/23] oeqa/selftest/wic: use os.path.join to join paths [22/23] oeqa/selftest/wic: use self.td instead of get_bb_var to save on bitbake calls [23/23] oeqa/selftest: generalise test_devtool_virtual_kernel_modify

Commit Message

Ross Burton March 31, 2022, 6:29 p.m. UTC

updateTestData() is just a simple loop that is only used here, so just
inline it.

Signed-off-by: Ross Burton <ross.burton@arm.com>
---
 meta/classes/testimage.bbclass | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff mbox series

Patch

diff --git a/meta/classes/testimage.bbclass b/meta/classes/testimage.bbclass
index 898248992c8..8ffaeab2844 100644
--- a/meta/classes/testimage.bbclass
+++ b/meta/classes/testimage.bbclass
@@ -205,7 +205,6 @@  def testimage_main(d):
     import shutil
 
     from bb.utils import export_proxies
-    from oeqa.core.utils.misc import updateTestData
     from oeqa.runtime.context import OERuntimeTestContext
     from oeqa.runtime.context import OERuntimeTestContextExecutor
     from oeqa.core.target.qemu import supported_fstypes
@@ -245,7 +244,8 @@  def testimage_main(d):
 
     # Some variables need to be updates (mostly paths) with the
     # ones of the current environment because some tests require them.
-    updateTestData(d, td, d.getVar('TESTIMAGE_UPDATE_VARS').split())
+    for var in d.getVar('TESTIMAGE_UPDATE_VARS').split():
+        td[var] = d.getVar(var)
 
     image_manifest = "%s.manifest" % image_name
     image_packages = OERuntimeTestContextExecutor.readPackagesManifest(image_manifest)