fixed up unittests to match slightly more expressive error messages

Author: tclose

pydra/engine/specs.py

@@ -294,7 +294,8 @@ def check_metadata(self):
             # not allowing for default if the field is mandatory
             if not fld.default == attr.NOTHING and mdata.get("mandatory"):
                 raise AttributeError(
-                    "default value should not be set when the field is mandatory"
+                    f"default value ({fld.default!r}) should not be set when the field "
+                    f"('{fld.name}') in {self}) is mandatory"
                 )
             # setting default if value not provided and default is available
             if getattr(self, fld.name) is None:
@@ -385,19 +386,19 @@ def check_metadata(self):
                     raise TypeError(
                         f"Type of '{fld.name}' should be either pathlib.Path or "
                         f"typing.Union[pathlib.Path, bool] (not {fld.type}) because "
-                        f"it has a value for output_file_template ({mdata['output_file_template']})"
+                        f"it has a value for output_file_template ({mdata['output_file_template']!r})"
                     )
                 if fld.default not in [attr.NOTHING, True, False]:
                     raise AttributeError(
-                        f"default value ({fld.default}) should not be set together with "
-                        f"output_file_template ({mdata['output_file_template']}) for "
+                        f"default value ({fld.default!r}) should not be set together with "
+                        f"output_file_template ({mdata['output_file_template']!r}) for "
                         f"'{fld.name}' field in {self}"
                     )
             # not allowing for default if the field is mandatory
             if not fld.default == attr.NOTHING and mdata.get("mandatory"):
                 raise AttributeError(
-                    f"default value ({fld.default}) should not be set when the field "
-                    f"('{fld.name}' in {self}) is mandatory"
+                    f"default value ({fld.default!r}) should not be set when the field "
+                    f"('{fld.name}') in {self}) is mandatory"
                 )
             # setting default if value not provided and default is available
             if getattr(self, fld.name) is None:

pydra/engine/tests/test_shelltask.py

@@ -648,12 +648,10 @@ def test_shell_cmd_inputspec_4c_exception(plugin):
     )
 
     # separate command into exec + args
-    with pytest.raises(Exception) as excinfo:
+    with pytest.raises(
+        Exception, match="default value \('Hello'\) should not be set when the field"
+    ):
         ShellCommandTask(name="shelly", executable=cmd_exec, input_spec=my_input_spec)
-    assert (
-        str(excinfo.value)
-        == "default value should not be set when the field is mandatory"
-    )
 
 
 def test_shell_cmd_inputspec_4d_exception(plugin):
@@ -680,12 +678,10 @@ def test_shell_cmd_inputspec_4d_exception(plugin):
     )
 
     # separate command into exec + args
-    with pytest.raises(Exception) as excinfo:
+    with pytest.raises(
+        Exception, match="default value \('Hello'\) should not be set together"
+    ) as excinfo:
         ShellCommandTask(name="shelly", executable=cmd_exec, input_spec=my_input_spec)
-    assert (
-        str(excinfo.value)
-        == "default value should not be set together with output_file_template"
-    )
 
 
 @pytest.mark.parametrize("results_function", [result_no_submitter, result_submitter])