summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorCory Bloor <Cordell.Bloor@amd.com>2021-10-01 17:40:24 -0600
committerGitHub <noreply@github.com>2021-10-01 19:40:24 -0400
commitb6169c213de742dc036d6eec0079bd22ee377071 (patch)
tree9b169b8164a0e5ef4f24d95e3d3c002f3e8d5dd3 /lib
parentd19105f76165857ca5f25ddb7e63a45a31b2ee92 (diff)
downloadspack-b6169c213de742dc036d6eec0079bd22ee377071.tar.gz
spack-b6169c213de742dc036d6eec0079bd22ee377071.tar.bz2
spack-b6169c213de742dc036d6eec0079bd22ee377071.tar.xz
spack-b6169c213de742dc036d6eec0079bd22ee377071.zip
Fix error message when test throws AttributeError (#25895)
Narrow the scope of the try/except block, to avoid a misleading error message if fn() throws an AttributeError.
Diffstat (limited to 'lib')
-rw-r--r--lib/spack/spack/package.py10
1 files changed, 6 insertions, 4 deletions
diff --git a/lib/spack/spack/package.py b/lib/spack/spack/package.py
index b3dbb5a2b5..e881fee522 100644
--- a/lib/spack/spack/package.py
+++ b/lib/spack/spack/package.py
@@ -2551,11 +2551,12 @@ class PackageBase(six.with_metaclass(PackageMeta, PackageViewMixin, object)):
for name in self.build_time_test_callbacks:
try:
fn = getattr(self, name)
- tty.msg('RUN-TESTS: build-time tests [{0}]'.format(name))
- fn()
except AttributeError:
msg = 'RUN-TESTS: method not implemented [{0}]'
tty.warn(msg.format(name))
+ else:
+ tty.msg('RUN-TESTS: build-time tests [{0}]'.format(name))
+ fn()
@on_package_attributes(run_tests=True)
def _run_default_install_time_test_callbacks(self):
@@ -2570,11 +2571,12 @@ class PackageBase(six.with_metaclass(PackageMeta, PackageViewMixin, object)):
for name in self.install_time_test_callbacks:
try:
fn = getattr(self, name)
- tty.msg('RUN-TESTS: install-time tests [{0}]'.format(name))
- fn()
except AttributeError:
msg = 'RUN-TESTS: method not implemented [{0}]'
tty.warn(msg.format(name))
+ else:
+ tty.msg('RUN-TESTS: install-time tests [{0}]'.format(name))
+ fn()
def test_process(pkg, kwargs):