Unit test tweaking.

Author: Paul-Ferrell

stackinator/mirror.py

@@ -66,11 +66,15 @@ def _load_mirrors(self, cmdline_cache: Optional[pathlib.Path]) -> Dict[str, Dict
         except ValueError as err:
             raise MirrorError(f"Mirror config does not comply with schema.\n{err}")
 
-        caches = {name: mirror for name, mirror in mirrors.items() if mirror['cache']}
+        caches = [name for name, mirror in mirrors.items() if mirror['cache']]
         if len(caches) > 1:
             raise MirrorError(
                 "Mirror config has more than one mirror specified as the build cache destination.\n"
                 f"{self._pp_yaml(caches)}")
+        elif caches:
+            cache = mirrors[caches[0]]
+            if not cache.get('private_key'):
+                raise MirrorError(f"Mirror build cache config '{caches[0]}' missing a required 'private_key' path.")
 
         # Load the cache as defined by the deprecated 'cache.yaml' file.
         if cmdline_cache is not None:

unittests/data/systems/mirror-ok/cache.yaml

@@ -0,0 +1,2 @@
+root: /tmp/foo
+key: ../../test-gpg-priv.asc

unittests/data/systems/mirror-ok/mirrors.yaml

@@ -5,7 +5,8 @@ disabled-mirror:
   enabled: false
 buildcache-mirror:
   url: https://mirror.spack.io
+  private_key: '../test-gpg-priv.asc'
   cache: true
 bootstrap-mirror:
   url: https://mirror.spack.io
-  bootstrap: true
+  bootstrap: true

unittests/test_mirrors.py

@@ -34,10 +34,11 @@ def test_mirror_init(systems_path, valid_mirrors):
 def test_command_line_cache(systems_path):
     """Check that adding a cache from the command line works."""
 
-    mirrors = mirror.Mirrors(systems_path/'mirror-basic', 
-                             cmdline_cache=systems_path/'mirror-basic/cache.yaml')
+    mirrors = mirror.Mirrors(systems_path/'mirror-ok', 
+                             cmdline_cache=systems_path/'mirror-ok/cache.yaml')
 
-    assert len(mirrors.mirrors) == 3
+    assert len(mirrors.mirrors) == 4
+    # This should always be the build cache even though one is already defined.
     assert mirrors.build_cache_mirror == 'cmdline_cache'
     cache_mirror = mirrors.mirrors['cmdline_cache']
     assert cache_mirror['url'] == '/tmp/foo'
@@ -46,12 +47,6 @@ def test_command_line_cache(systems_path):
     assert not cache_mirror['bootstrap']
     assert cache_mirror['mount_specific'] 
 
-def test_multi_buildcache(systems_path):
-    """Make sure we throw appropriate errors when there's more than one build cache defined."""
-
-
-
-
 def test_create_spack_mirrors_yaml(systems_path):
     pass