Added test for bad keys.

Author: Paul-Ferrell

stackinator/mirror.py

@@ -246,12 +246,7 @@ def _key_setup(self, key_store: pathlib.Path):
                 #try prepending system config path
                 path = self._system_config_root/path
 
-            if path.exists():
-                if not path.is_file():
-                    raise MirrorError(
-                        f"The key path '{path}' is not a file. \n"
-                        f"Check the key listed in mirrors.yaml in system config.")
-                
+            if path.is_file():
                 with open(path, 'rb') as reader:
                     binary_key = reader.read()
 
@@ -261,15 +256,15 @@ def _key_setup(self, key_store: pathlib.Path):
                     binary_key = base64.b64decode(key)
                 except ValueError:
                     raise MirrorError(
-                        f"Key for mirror '{name}' is not valid. \n"
+                        f"Key for mirror '{name}' is not valid: '{path}'. \n"
                         f"Must be a path to a GPG public key or a base64 encoded GPG public key. \n"
                         f"Check the key listed in mirrors.yaml in system config.")
 
             file_type = magic.from_buffer(binary_key, mime=True)
-            print("magic type:" , file_type)
             if file_type not in ("application/x-gnupg-keyring", "application/pgp-keys"):
                 raise MirrorError(
                     f"Key for mirror {name} is not a valid GPG key. \n"
+                    f"The file (or base64) was readable, but the data itself was not a PGP key.\n"
                     f"Check the key listed in mirrors.yaml in system config.")
 
             # copy key to new destination in key store

unittests/data/systems/mirror-bad-key/mirrors.yaml

@@ -1,3 +1,3 @@
-- name: bad-key
+bad-key:
   url: https://mirror.spack.io
-  public_key: /bad_key.gpg
+  public_key: bad_key.gpg

unittests/data/systems/mirror-bad-keypath/mirrors.yaml

@@ -1,3 +1,3 @@
-- name: bad-key-path
+bad-key-path:
   url: https://mirror.spack.io
-  public_key: /path/doesnt/exist
+  public_key: /path/doesnt/exist

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

@@ -68,3 +68,17 @@ def test_key_setup(systems_path, tmp_path):
         with key_file.open('rb') as file:
             key_file_data.append(file.read())
     assert key_file_data[0] == key_file_data[1]
+
+@pytest.mark.parametrize("system_name", [
+    'mirror-bad-key',
+    'mirror-bad-keypath',
+])
+def test_key_setup_bad_key(tmp_path, systems_path, system_name):
+    """asdfasdf"""
+
+    mirrors = mirror.Mirrors(systems_path/system_name)
+    with pytest.raises(mirror.MirrorError):
+        mirrors._key_setup(tmp_path)
+
+
+