Fix issues in tests (also after accidental commit to the master)

pymchelper/estimator.py

@@ -133,7 +133,7 @@ def average_with_nan(estimator_list, error_estimate=ErrorEstimate.stderr):
     if not estimator_list:
         return None
     result = copy.deepcopy(estimator_list[0])
-    result.number_of_primaries = sum([estimator.number_of_primaries for estimator in estimator_list])
+    result.number_of_primaries = sum(estimator.number_of_primaries for estimator in estimator_list)
     for page_no, page in enumerate(result.pages):
         page.data_raw = np.nanmean([estimator.pages[page_no].data_raw for estimator in estimator_list], axis=0)
     result.file_counter = len(estimator_list)

tests/test_call_entry.py

@@ -48,7 +48,7 @@ def test_call_cmd_option(option_name: str):
     with pytest.raises(SystemExit) as e:
         logger.info("Catching {%s}", e)
         run.main([f'--{option_name}'])
-        assert e.value == 0
+    assert e.value.args[0] == 0
 
 
 @pytest.mark.smoke

tests/test_mcscripter.py

@@ -46,17 +46,17 @@ def default_config_path() -> Path:
 def test_call_cmd_option(option_name: str):
     """Description needed."""
     with pytest.raises(SystemExit) as e:
-        logger.info("Catching {:s}".format(str(e)))
+        logger.info("Catching %s", e)
         pymchelper.utils.mcscripter.main(['--' + option_name])
-        assert e.value == 0
+    assert e.value.args[0] == 0
 
 
 def test_call_cmd_no_option():
     """Description needed."""
     with pytest.raises(SystemExit) as e:
-        logger.info("Catching {:s}".format(str(e)))
+        logger.info("Catching %s", e)
         pymchelper.utils.mcscripter.main([])
-        assert e.value == 2
+    assert e.value.args[0] == 2
 
 
 @pytest.mark.parametrize("config_path", Configs.list(), ids=Configs.names())
@@ -106,8 +106,7 @@ def test_writing_template(config_path: Path, tmp_path: Path):
 
 
 @pytest.mark.parametrize("config_path", Configs.list(), ids=Configs.names())
-def test_execution(config_path: Path, monkeypatch: pytest.MonkeyPatch,
-                   tmp_path: Path):
+def test_execution(config_path: Path, monkeypatch: pytest.MonkeyPatch, tmp_path: Path):
     """Description needed."""
     logger.debug(f"current working directory {os.getcwd()}")
     full_path_to_config = config_path.resolve()

tests/test_plan.py

@@ -24,25 +24,23 @@ def test_call_cmd_no_option():
     with pytest.raises(SystemExit) as e:
         logger.info("Catching: %s", e)
         pymchelper.utils.radiotherapy.plan.main([])
-        assert e.value == 2
+    assert e.value.args[0] == 2
 
 
 @pytest.mark.parametrize("option_name", ["version", "help"])
 def test_call_cmd_option(option_name: str):
     """Test calling pymchelper with no options."""
     with pytest.raises(SystemExit) as e:
         logger.info("Catching: %s", e)
-        pymchelper.utils.radiotherapy.plan.main([])
-        assert e.value == 0
+        pymchelper.utils.radiotherapy.plan.main(['--' + option_name])
+    assert e.value.args[0] == 0
 
 
 @pytest.mark.parametrize("option_name", ["", "flip", "xflip", "yflip"])
 @pytest.mark.parametrize("input_file_path", input_files.values(), ids=input_files.keys())
 @pytest.mark.parametrize("beam_model_path", [beam_model_path, None], ids=[beam_model_path.stem, "no_beam_model"])
-def test_generate_plan(input_file_path: Path, beam_model_path: Union[Path, None],
-                       monkeypatch: pytest.MonkeyPatch,
-                       tmp_path: Path, capsys: pytest.CaptureFixture,
-                       option_name: str):
+def test_generate_plan(input_file_path: Path, beam_model_path: Union[Path, None], monkeypatch: pytest.MonkeyPatch,
+                       tmp_path: Path, capsys: pytest.CaptureFixture, option_name: str):
     """Test plan loading with and without beam model."""
     expected_output_file_path = Path(output_file)