From 0fc5716c1192df5180204a8679569c5d91cc0f1b Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Sat, 10 May 2025 09:43:49 +0100 Subject: [PATCH] oeqa/sdk/maturin: no need for a setupClass, merge code into test There's no need to copy files inside setUpClass() when there's only one test function that uses it. Just do all of the test inside the test. (From OE-Core rev: 5474677b21f2f4069f355abdc600483c42d0b0b3) Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/lib/oeqa/sdk/cases/maturin.py | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/meta/lib/oeqa/sdk/cases/maturin.py b/meta/lib/oeqa/sdk/cases/maturin.py index 83d13c4ec5..e3e8edc781 100644 --- a/meta/lib/oeqa/sdk/cases/maturin.py +++ b/meta/lib/oeqa/sdk/cases/maturin.py @@ -30,17 +30,6 @@ class MaturinTest(OESDKTestCase): self.assertIn(expected, output) class MaturinDevelopTest(OESDKTestCase): - @classmethod - def setUpClass(self): - targetdir = os.path.join(self.tc.sdk_dir, "guessing-game") - try: - shutil.rmtree(targetdir) - except FileNotFoundError: - pass - shutil.copytree( - os.path.join(self.tc.files_dir, "maturin/guessing-game"), targetdir - ) - def setUp(self): machine = self.td.get("MACHINE") self.ensure_host_package("python3-maturin") @@ -58,9 +47,17 @@ class MaturinDevelopTest(OESDKTestCase): (1) that a .venv can been created. (2) a functional 'rustc' and 'cargo' """ - self._run("cd %s/guessing-game; python3 -m venv .venv" % self.tc.sdk_dir) - cmd = "cd %s/guessing-game; maturin develop" % self.tc.sdk_dir - output = self._run(cmd) + targetdir = os.path.join(self.tc.sdk_dir, "guessing-game") + try: + shutil.rmtree(targetdir) + except FileNotFoundError: + pass + shutil.copytree( + os.path.join(self.tc.files_dir, "maturin/guessing-game"), targetdir + ) + + self._run("cd %s; python3 -m venv .venv" % targetdir) + output = self._run("cd %s; maturin develop" % targetdir) self.assertRegex(output, r"🔗 Found pyo3 bindings with abi3 support for Python ≥ 3.8") self.assertRegex(output, r"🐍 Not using a specific python interpreter") self.assertRegex(output, r"📡 Using build options features from pyproject.toml")