From 057b41507462f2aa9a151d59c8ebea96f271cee2 Mon Sep 17 00:00:00 2001 From: AcriusWinter <152348900+AcriusWinter@users.noreply.github.com> Date: Fri, 26 Jul 2024 13:07:06 -0700 Subject: pinentry: old to new test API (#45011) * pinentry: New API * move code around * added back version check * Complete check_version refactor * Honor original handling of guis (i.e., don't try if not there) --------- Co-authored-by: Tamara Dahlgren --- .../repos/builtin/packages/pinentry/package.py | 30 +++++++++++++--------- 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/var/spack/repos/builtin/packages/pinentry/package.py b/var/spack/repos/builtin/packages/pinentry/package.py index 81b166f3a3..d4d9876766 100644 --- a/var/spack/repos/builtin/packages/pinentry/package.py +++ b/var/spack/repos/builtin/packages/pinentry/package.py @@ -3,7 +3,6 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) - from spack.package import * @@ -95,17 +94,24 @@ class Pinentry(AutotoolsPackage): args.append("--enable-pinentry-" + gui) else: args.append("--disable-pinentry-" + gui) - return args - def test(self): - kwargs = { - "exe": self.prefix.bin.pinentry, - "options": ["--version"], - "expected": [str(self.version)], - } - self.run_test(**kwargs) + def check_version(self, exe_name): + """Version check""" + exe = which(join_path(self.prefix.bin, exe_name)) + out = exe("--version", output=str.split, error=str.split) + assert str(self.version) in out + + def test_pinentry(self): + """Confirm pinentry version""" + self.check_version("pinentry") + + def test_guis(self): + """Check gui versions""" for gui in self.supported_guis: - if "gui=" + gui in self.spec: - kwargs["exe"] = self.prefix.bin.pinentry + "-" + gui - self.run_test(**kwargs) + if f"gui={gui}" not in self.spec: + continue + + exe_name = f"pinentry-{gui}" + with test_part(self, f"test_guis_{gui}", purpose=f"Check {exe_name} version"): + self.check_version(exe_name) -- cgit v1.2.3-70-g09d2