Fix Python issue with build failures; Add test case for build failures. (#2687)
This commit is contained in:
@@ -60,9 +60,10 @@
|
||||
|
||||
import llnl.util.lang as lang
|
||||
import llnl.util.tty as tty
|
||||
from llnl.util.filesystem import *
|
||||
|
||||
import spack
|
||||
import spack.store
|
||||
from llnl.util.filesystem import *
|
||||
from spack.environment import EnvironmentModifications, validate
|
||||
from spack.util.environment import *
|
||||
from spack.util.executable import Executable, which
|
||||
@@ -450,7 +451,8 @@ def parent_class_modules(cls):
|
||||
"""
|
||||
Get list of super class modules that are all descend from spack.Package
|
||||
"""
|
||||
if not issubclass(cls, spack.Package) or issubclass(spack.Package, cls):
|
||||
if (not issubclass(cls, spack.package.Package) or
|
||||
issubclass(spack.package.Package, cls)):
|
||||
return []
|
||||
result = []
|
||||
module = sys.modules.get(cls.__module__)
|
||||
@@ -622,9 +624,9 @@ def make_stack(tb, stack=None):
|
||||
for tb in stack:
|
||||
frame = tb.tb_frame
|
||||
if 'self' in frame.f_locals:
|
||||
# Find the first proper subclass of spack.PackageBase.
|
||||
# Find the first proper subclass of PackageBase.
|
||||
obj = frame.f_locals['self']
|
||||
if isinstance(obj, spack.PackageBase):
|
||||
if isinstance(obj, spack.package.PackageBase):
|
||||
break
|
||||
|
||||
# we found obj, the Package implementation we care about.
|
||||
|
@@ -90,3 +90,15 @@ def test_store(mock_archive):
|
||||
except Exception:
|
||||
pkg.remove_prefix()
|
||||
raise
|
||||
|
||||
|
||||
@pytest.mark.usefixtures('install_mockery')
|
||||
def test_failing_build(mock_archive):
|
||||
spec = Spec('failing-build').concretized()
|
||||
|
||||
for s in spec.traverse():
|
||||
fake_fetchify(mock_archive.url, s.package)
|
||||
|
||||
pkg = spec.package
|
||||
with pytest.raises(spack.build_environment.ChildError):
|
||||
pkg.do_install()
|
||||
|
Reference in New Issue
Block a user