updated test mirror format

Author: grodzki-lanl

stackinator/schema/mirror.json

@@ -12,7 +12,7 @@
             "description": {
                 "type": "string",
                 "description": "What this mirror is for."
-            }
+            },
             "enabled": {
                 "type": "boolean",
                 "default": true,
@@ -34,12 +34,12 @@
             },
             "private_key": {
                 "type": "string",
-                "description": "Private PGP key for signing binary cache packages. (Path only)",
+                "description": "Private PGP key for signing binary cache packages. (Path only)"
             },
             "mount_specific": {
                 "type": "boolean",
                 "default": false,
-                "description": "Use a mount specific buildcache path (specified path + recipe mount point).",
+                "description": "Use a mount specific buildcache path (specified path + recipe mount point)."
             }
         }
     }

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

@@ -1,11 +1,7 @@
-- name: fake-mirror
-  url: https://google.com
-- name: disabled-mirror
-  url: https://google.com
+- url: https://google.com
+- url: https://google.com
   enabled: false
-- name: buildcache-mirror
-  url: https://cache.spack.io/
-  buildcache: true
-- name: bootstrap-mirror
-  url: https://mirror.spack.io
+- url: https://cache.spack.io/
+  cache: true
+- url: https://mirror.spack.io
   bootstrap: true

unittests/test_mirrors.py

@@ -14,21 +14,19 @@ def systems_path(test_path):
 @pytest.fixture
 def valid_mirrors(systems_path):
     mirrors = {}
-    mirrors["fake-mirror"] = {'url': 'https://google.com'}
-    mirrors["buildcache-mirror"] = {'url': 'https://cache.spack.io/', 'buildcache': True}
-    mirrors["bootstrap-mirror"] = {'url': 'https://mirror.spack.io', 'bootstrap': True}
+    mirrors["fake-mirror"] = {'url': 'https://google.com', 'enabled': True, 'bootstrap': False, 'cache': False, 'mount_specific': False}
+    mirrors["buildcache-mirror"] = {'url': 'https://cache.spack.io/', 'enabled': True, 'bootstrap': False, 'cache': True, 'mount_specific': False}
+    mirrors["bootstrap-mirror"] = {'url': 'https://mirror.spack.io', 'enabled': True, 'bootstrap': True, 'cache': False, 'mount_specific': False}
     return mirrors
 
 def test_mirror_init(systems_path, valid_mirrors):
     path = systems_path / "mirror_ok"
-    mirrors = mirror.Mirrors(path)
-    print(valid_mirrors)
-    print(mirrors)
-    assert mirrors == valid_mirrors
-    assert mirrors.bootstrap_mirrors == [mirror for mirror in valid_mirrors if mirror["bootstrap"]]
-    assert mirrors.build_cache_mirror == [mirror for mirror in valid_mirrors if mirror['buildcache']]
+    mirrors_obj = mirror.Mirrors(path)
+    assert mirrors_obj.mirrors == valid_mirrors
+    assert mirrors_obj.mirrors.bootstrap_mirrors == [mirror for mirror in valid_mirrors.values() if mirror.get('bootstrap')]
+    assert mirrors_obj.mirrors.build_cache_mirror == [mirror for mirror in valid_mirrors.values() if mirror.get('buildcache')]
     # assert disabled mirror not in mirrors
-    for mir in mirrors:
+    for mir in mirrors_obj.mirrors:
         assert mir["enabled"]
     # test that cmdline_cache gets added to mirrors?