more test fix

ReproNim · Nov 10, 2023 · fbd205d · fbd205d
1 parent cc42f0f
commit fbd205d
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 4 deletions.
diff --git a/neurodocker/reproenv/tests/test_renderers_docker.py b/neurodocker/reproenv/tests/test_renderers_docker.py
@@ -11,6 +11,7 @@ def test_docker_renderer_add_template():
 
     d = {
         "name": "foobar",
+        "url": "some-url",
         "binaries": {
             "urls": {"1.0.0": "foobar"},
             "env": {"foo": "bar"},
@@ -64,6 +65,7 @@ def test_docker_renderer_add_template():
     # Test required arguments.
     d = {
         "name": "foobar",
+        "url": "some-url",
         "binaries": {
             "urls": {"1.0.0": "foobar"},
             "env": {"foo": "bar"},
@@ -90,6 +92,7 @@ def test_docker_renderer_add_template():
 
     d = {
         "name": "foobar",
+        "url": "some-url",
         "binaries": {
             "urls": {"1.0.0": "foobar"},
             "env": {"foo": "bar"},

diff --git a/neurodocker/reproenv/tests/test_renderers_singularity.py b/neurodocker/reproenv/tests/test_renderers_singularity.py
@@ -11,6 +11,7 @@ def test_singularity_renderer_add_template():
 
     d = {
         "name": "foobar",
+        "url": "some-url",
         "binaries": {
             "urls": {"1.0.0": "foobar"},
             "env": {"foo": "bar"},
@@ -59,6 +60,7 @@ def test_singularity_renderer_add_template():
 
     d = {
         "name": "baz",
+        "url": "some-url",
         "binaries": {
             "urls": {"1.0.0": "foobar"},
             "env": {"foo": "bar"},

diff --git a/neurodocker/reproenv/tests/test_state.py b/neurodocker/reproenv/tests/test_state.py
@@ -11,8 +11,10 @@ def test_validate_template_invalid_templates():
     with pytest.raises(exceptions.TemplateError, match="'name' is a required property"):
         _validate_template({})
 
-    with pytest.raises(exceptions.TemplateError, match="{'name': 'bar'} is not valid"):
-        _validate_template({"name": "bar"})
+    with pytest.raises(
+        exceptions.TemplateError, match="is not valid under any of the given schemas"
+    ):
+        _validate_template({"name": "bar", "url": "some-url"})
 
     # missing 'name' top-level key
     with pytest.raises(exceptions.TemplateError, match="'name' is a required property"):
@@ -28,6 +30,7 @@ def test_validate_template_invalid_templates():
         _validate_template(
             {
                 "name": 1234,
+                "url": "some-url",
                 "binaries": {"urls": {"1.0.0": "foobar.com"}, "instructions": "foobar"},
             }
         )
@@ -43,6 +46,7 @@ def test_validate_template_invalid_templates():
         _validate_template(
             {
                 "name": "foobar",
+                "url": "some-url",
                 "binaries": {
                     "urls": {"1.0.0": "foobar.com"},
                     # "instructions": "foobar",
@@ -58,6 +62,7 @@ def test_validate_template_invalid_templates():
         _validate_template(
             {
                 "name": "foobar",
+                "url": "some-url",
                 "binaries": {
                     "urls": {"1.0.0": "foobar.com"},
                     "env": {"foo": ["foo"]},
@@ -71,6 +76,7 @@ def test_validate_template_invalid_templates():
         _validate_template(
             {
                 "name": "foobar",
+                "url": "some-url",
                 "binaries": {
                     # "urls": {"1.0.0": "foobar.com"},
                     "instructions": "foobar"
@@ -89,6 +95,7 @@ def test_validate_template_invalid_templates():
         _validate_template(
             {
                 "name": "foobar",
+                "url": "some-url",
                 "binaries": {
                     "urls": {"1.0.0": "foobar.com"},
                     "instructions": "foobar",
@@ -108,6 +115,7 @@ def test_validate_template_invalid_templates():
         _validate_template(
             {
                 "name": "foobar",
+                "url": "some-url",
                 "binaries": {
                     "urls": {"1.0.0": "foobar.com"},
                     "instructions": "foobar",
@@ -134,6 +142,7 @@ def test_validate_template_invalid_templates():
         _validate_template(
             {
                 "name": "foobar",
+                "url": "some-url",
                 "source": {"urls": {"1.0.0": "foobar.com"}, "instructions": "foobar"},
             }
         )
@@ -145,6 +154,7 @@ def test_validate_template_invalid_templates():
         _validate_template(
             {
                 "name": "foobar",
+                "url": "some-url",
                 "source": {
                     # "instructions": "foobar",
                 },
@@ -159,6 +169,7 @@ def test_validate_template_invalid_templates():
         _validate_template(
             {
                 "name": "foobar",
+                "url": "some-url",
                 "source": {"env": {"foo": ["foo"]}, "instructions": "foobar"},
             }
         )
@@ -172,7 +183,11 @@ def test_validate_template_invalid_templates():
         ),
     ):
         _validate_template(
-            {"name": "foobar", "source": {"instructions": "foobar", "extra": ""}}
+            {
+                "name": "foobar",
+                "url": "some-url",
+                "source": {"instructions": "foobar", "extra": ""},
+            }
         )
 
     # extra keys in dependencies
@@ -186,6 +201,7 @@ def test_validate_template_invalid_templates():
         _validate_template(
             {
                 "name": "foobar",
+                "url": "some-url",
                 "source": {
                     "instructions": "foobar",
                     "dependencies": {"apt": [], "fakemngr": []},
@@ -202,15 +218,19 @@ def test_validate_template_valid_templates():
     _validate_template(
         {
             "name": "foobar",
+            "url": "some-url",
             "binaries": {"urls": {"v1": "foo"}, "instructions": "foobar"},
         }
     )
-    _validate_template({"name": "foobar", "source": {"instructions": "foobar"}})
+    _validate_template(
+        {"name": "foobar", "url": "some-url", "source": {"instructions": "foobar"}}
+    )
 
     # bigger templates
     _validate_template(
         {
             "name": "foobar",
+            "url": "some-url",
             "binaries": {
                 "urls": {"v1": "foo"},
                 "env": {"baz": "cat", "boo": "123"},
@@ -233,6 +253,7 @@ def test_register(tmp_path: Path):
 
     _one_test_template: types.TemplateType = {
         "name": "foobar",
+        "url": "some-url",
         "binaries": {
             "urls": {"1.0.0": "foobar.com"},
             "env": {"foo": "bar"},

diff --git a/neurodocker/reproenv/tests/test_template.py b/neurodocker/reproenv/tests/test_template.py
@@ -6,6 +6,7 @@
 def test_template():
     d = {
         "name": "foobar",
+        "url": "some-url",
         "binaries": {
             "urls": {"v1": "foo"},
             "env": {"baz": "cat", "boo": "123"},
@@ -62,6 +63,7 @@ def test_template():
     t = template.Template(
         {
             "name": "foobar",
+            "url": "some-url",
             "binaries": {
                 "urls": {"v1": "foo"},
                 "env": {"baz": "cat", "boo": "123"},
@@ -78,6 +80,7 @@ def test_template():
     t = template.Template(
         {
             "name": "foobar",
+            "url": "some-url",
             "source": {
                 "env": {"foo": "bar"},
                 "instructions": "echo foo\n{{ self.boo }}",
@@ -197,6 +200,7 @@ def test_template_alert():
     d: types.TemplateType = {
         "alert": "This is an alert!",
         "name": "testing",
+        "url": "some-url",
         "binaries": {"urls": {"foo": "foo.baz.tar.gz"}, "instructions": "do nothing"},
     }
     tmpl = template.Template(d)