Windows/testing: enable tests for "spack find" (#33588)
This commit is contained in:
parent
a424f7f173
commit
c3e3c392a6
@ -25,8 +25,6 @@
|
||||
|
||||
base32_alphabet = "abcdefghijklmnopqrstuvwxyz234567"
|
||||
|
||||
pytestmark = pytest.mark.skipif(sys.platform == "win32", reason="does not run on windows")
|
||||
|
||||
|
||||
@pytest.fixture(scope="module")
|
||||
def parser():
|
||||
@ -131,15 +129,28 @@ def test_namespaces_shown_correctly(database):
|
||||
|
||||
@pytest.mark.db
|
||||
def test_find_cli_output_format(database, mock_tty_stdout):
|
||||
# Currently logging on Windows detaches stdout
|
||||
# from the terminal so we miss some output during tests
|
||||
# TODO: (johnwparent): Once logging is amended on Windows,
|
||||
# restore this test
|
||||
out = find("zmpi")
|
||||
assert out.endswith(
|
||||
dedent(
|
||||
"""\
|
||||
zmpi@1.0
|
||||
==> 1 installed package
|
||||
"""
|
||||
if not sys.platform == "win32":
|
||||
assert out.endswith(
|
||||
dedent(
|
||||
"""\
|
||||
zmpi@1.0
|
||||
==> 1 installed package
|
||||
"""
|
||||
)
|
||||
)
|
||||
else:
|
||||
assert out.endswith(
|
||||
dedent(
|
||||
"""\
|
||||
zmpi@1.0
|
||||
"""
|
||||
)
|
||||
)
|
||||
)
|
||||
|
||||
|
||||
def _check_json_output(spec_list):
|
||||
@ -349,6 +360,7 @@ def test_find_command_basic_usage(database):
|
||||
assert "mpileaks" in output
|
||||
|
||||
|
||||
@pytest.mark.skipif(sys.platform == "win32", reason="envirnment is not yet supported on windows")
|
||||
@pytest.mark.regression("9875")
|
||||
def test_find_prefix_in_env(
|
||||
mutable_mock_env_path, install_mockery, mock_fetch, mock_packages, mock_archive, config
|
||||
|
@ -18,9 +18,8 @@ class Callpath(Package):
|
||||
depends_on("mpi")
|
||||
|
||||
def install(self, spec, prefix):
|
||||
configure("--prefix=%s" % prefix)
|
||||
make()
|
||||
make("install")
|
||||
mkdirp(prefix)
|
||||
touch(join_path(prefix, "dummyfile"))
|
||||
|
||||
def setup_run_environment(self, env):
|
||||
env.set("FOOBAR", self.name)
|
||||
|
@ -30,6 +30,5 @@ class Dyninst(Package):
|
||||
depends_on("libdwarf")
|
||||
|
||||
def install(self, spec, prefix):
|
||||
configure("--prefix=%s" % prefix)
|
||||
make()
|
||||
make("install")
|
||||
mkdirp(prefix)
|
||||
touch(join_path(prefix, "dummyfile"))
|
||||
|
Loading…
Reference in New Issue
Block a user