Fix pytest running with -vs (#1980)

mantidproject · Nov 23, 2023 · a621306 · a621306
2 parents c227fb2 + 287557b
commit a621306
Showing 1 changed file with 15 additions and 10 deletions.
diff --git a/mantidimaging/gui/windows/spectrum_viewer/test/model_test.py b/mantidimaging/gui/windows/spectrum_viewer/test/model_test.py
@@ -20,13 +20,16 @@
 
 class CloseCheckStream(io.StringIO):
     is_closed: bool = False
+    captured: list[str] = []
 
     def close(self) -> None:
-        # don't call real close as it clears buffer
+        # On close capture value
         self.is_closed = True
+        self.captured = self.getvalue().splitlines()
+        super().close()
 
 
-class SpectrumViewerWindowPresenterTest(unittest.TestCase):
+class SpectrumViewerWindowModelTest(unittest.TestCase):
 
     def setUp(self) -> None:
         self.presenter = mock.create_autospec(SpectrumViewerWindowPresenter)
@@ -180,12 +183,13 @@ def test_save_csv(self):
         mock_stream = CloseCheckStream()
         mock_path = mock.create_autospec(Path)
         mock_path.open.return_value = mock_stream
+        with mock.patch("mantidimaging.gui.windows.spectrum_viewer.SpectrumViewerWindowModel.save_roi_coords"):
+            self.model.save_csv(mock_path, False)
 
-        self.model.save_csv(mock_path, False)
         mock_path.open.assert_called_once_with("w")
-        self.assertIn("# tof_index,all,roi", mock_stream.getvalue())
-        self.assertIn("0.0,0.0,0.0", mock_stream.getvalue())
-        self.assertIn("1.0,2.0,2.0", mock_stream.getvalue())
+        self.assertIn("# tof_index,all,roi", mock_stream.captured[0])
+        self.assertIn("0.0,0.0,0.0", mock_stream.captured[1])
+        self.assertIn("1.0,2.0,2.0", mock_stream.captured[2])
         self.assertTrue(mock_stream.is_closed)
 
     def test_WHEN_save_csv_called_THEN_save_roi_coords_called_WITH_correct_args(self):
@@ -221,12 +225,13 @@ def test_save_csv_norm(self):
         mock_stream = CloseCheckStream()
         mock_path = mock.create_autospec(Path)
         mock_path.open.return_value = mock_stream
+        with mock.patch("mantidimaging.gui.windows.spectrum_viewer.SpectrumViewerWindowModel.save_roi_coords"):
+            self.model.save_csv(mock_path, True)
 
-        self.model.save_csv(mock_path, True)
         mock_path.open.assert_called_once_with("w")
-        self.assertIn("# tof_index,all,all_open,all_norm,roi,roi_open,roi_norm", mock_stream.getvalue())
-        self.assertIn("0.0,0.0,2.0,0.0,0.0,2.0,0.0", mock_stream.getvalue())
-        self.assertIn("1.0,1.0,2.0,0.5,1.0,2.0,0.5", mock_stream.getvalue())
+        self.assertIn("# tof_index,all,all_open,all_norm,roi,roi_open,roi_norm", mock_stream.captured[0])
+        self.assertIn("0.0,0.0,2.0,0.0,0.0,2.0,0.0", mock_stream.captured[1])
+        self.assertIn("1.0,1.0,2.0,0.5,1.0,2.0,0.5", mock_stream.captured[2])
         self.assertTrue(mock_stream.is_closed)
 
     def test_WHEN_roi_name_generator_called_THEN_correct_names_returned_visible_to_model(self):