Testing fixes for CI

sandialabs · Dec 2, 2023 · ae5c769 · ae5c769
1 parent 1785b27
commit ae5c769
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 13 deletions.
diff --git a/manager/__init__.py b/manager/__init__.py
@@ -5,14 +5,12 @@
 # This software is released under the BSD 3-clause license. See LICENSE file
 # for more details.
 
-import importlib.util
 import os
 
 import llnl.util.lang
 
 import spack.util.spack_yaml as syaml
 
-# from project import Project
 from spack.util.path import canonicalize_path
 
 DETECTION_SCRIPT = "find-{n}.py"

diff --git a/tests/conftest.py b/tests/conftest.py
@@ -11,9 +11,12 @@
 
 import pytest
 
-import spack.extensions.manager as manager
 from spack.test.conftest import *  # noqa: F401 F403
+import spack.extensions
 
+spack.extensions.get_module("manager")
+
+import spack.extensions.manager as manager # noqa E402
 _test_root = os.path.dirname(__file__)
 
 

diff --git a/tests/mock/project_a/find-project_a.py b/tests/mock/project_a/find-project_a.py
@@ -1,6 +1,11 @@
+# Copyright (c) 2022, National Technology & Engineering Solutions of Sandia,
+# LLC (NTESS). Under the terms of Contract DE-NA0003525 with NTESS, the U.S.
+# Government retains certain rights in this software.
+#
+# This software is released under the BSD 3-clause license. See LICENSE file
+# for more details.
+
 import os
-import socket
-import sys
 
 
 class MachineData:

diff --git a/tests/test_create_dev_env.py b/tests/test_create_dev_env.py
@@ -5,6 +5,7 @@
 # This software is released under the BSD 3-clause license. See LICENSE file
 # for more details.
 
+'''
 import os
 from unittest.mock import patch
 
@@ -13,7 +14,6 @@
 
 # manager = spack.main.SpackCommand("manager")
 
-'''
 @patch("manager_cmds.create_dev_env.develop")
 def test_allSpecsCallSpackDevelop(mock_dev, tmpdir):
     with tmpdir.as_cwd():

diff --git a/tests/test_create_env.py b/tests/test_create_env.py
@@ -6,8 +6,6 @@
 # for more details.
 
 import os
-from tempfile import TemporaryDirectory
-
 import pytest
 
 import spack.environment as env
@@ -31,8 +29,8 @@ def test_basicDirectoryProperties(tmpdir, on_moonlight):
             assert yaml["spack"]["concretizer"]["unify"] is True
 
 
-def test_failsWithAnUnregisteredMachine():
-    with TemporaryDirectory() as tmpdir:
+def test_failsWithAnUnregisteredMachine(tmpdir):
+    with tmpdir.as_cwd():
         with pytest.raises(Exception):
             manager("create-env", "-d", tmpdir, "-m", "theGOAT_HPC")
 

diff --git a/tests/test_develop.py b/tests/test_develop.py
@@ -5,6 +5,7 @@
 # This software is released under the BSD 3-clause license. See LICENSE file
 # for more details.
 
+"""
 import os
 from unittest.mock import patch
 
@@ -16,7 +17,6 @@
 env = spack.main.SpackCommand("env")
 # manager = spack.main.SpackCommand("manager")
 
-"""
 @pytest.mark.usefixtures("mutable_mock_env_path", "mock_packages", "mock_fetch")
 class TestSpackManagerDevelop(object):
     @patch("manager_cmds.develop.spack_develop.develop")

diff --git a/tests/test_external.py b/tests/test_external.py
@@ -5,6 +5,7 @@
 # This software is released under the BSD 3-clause license. See LICENSE file
 # for more details.
 
+'''
 import os
 from unittest.mock import patch
 
@@ -25,7 +26,6 @@
 env = spack.main.SpackCommand("env")
 manager = spack.main.SpackCommand("manager")
 
-'''
 @pytest.mark.parametrize(
     "spec_str",
     [

diff --git a/tests/test_pin.py b/tests/test_pin.py
@@ -7,10 +7,10 @@
 
 # from manager_cmds.pin import pin_graph
 
+"""
 from spack.spec import Spec
 from spack.version import GitVersion
 
-"""
 # =============================================================================
 # These tests  are really slow because we have to concretize
 # it would be good to come up with a quick concretization test suite