Remove regression from merge

Author: Dimitar Tasev

mantidimaging/core/parallel/test/utility_test.py

@@ -2,11 +2,8 @@
 # SPDX - License - Identifier: GPL-3.0-or-later
 
 from unittest import mock
-import numpy as np
-import SharedArray as sa
 
-from mantidimaging.core.parallel.utility import (create_array, create_shared_name, execute_impl,
-                                                 free_all_owned_by_this_instance, multiprocessing_necessary)
+from mantidimaging.core.parallel.utility import execute_impl, multiprocessing_necessary
 
 
 def test_correctly_chooses_parallel():
@@ -41,25 +38,6 @@ def test_execute_impl_par(mock_pool):
     assert mock_progress.update.call_count == 15
 
 
-def test_free_all_owned_by_this_instance():
-    name1 = create_shared_name()
-    name2 = create_shared_name()
-    name3 = create_shared_name()
-    create_array((10, 10), np.float32, name=name1)
-    create_array((10, 10), np.float32, name=name2)
-    create_array((10, 10), np.float32, name=name3)
-
-    temp_name = "not_this_instance"
-    sa.create("not_this_instance", (10, 10))
-
-    free_all_owned_by_this_instance()
-    assert name1 not in [arr.name.decode("utf-8") for arr in sa.list()]
-    assert name2 not in [arr.name.decode("utf-8") for arr in sa.list()]
-    assert name3 not in [arr.name.decode("utf-8") for arr in sa.list()]
-    assert temp_name in [arr.name.decode("utf-8") for arr in sa.list()]
-    sa.delete(temp_name)
-
-
 if __name__ == "__main__":
     import pytest
 

mantidimaging/core/parallel/utility.py

@@ -25,22 +25,6 @@
 
 NP_DTYPE = Type[np.single]
 
-INSTANCE_PREFIX = str(uuid.uuid4())
-
-
-def free_all_owned_by_this_instance():
-    for arr in [array for array in sa.list() if array.name.decode("utf-8").startswith(INSTANCE_PREFIX)]:
-        sa.delete(arr.name.decode("utf-8"))
-
-
-def has_other_shared_arrays() -> bool:
-    return len(sa.list()) > 0
-
-
-def free_all():
-    for arr in [array for array in sa.list()]:
-        sa.delete(arr.name.decode("utf-8"))
-
 
 def enough_memory(shape, dtype):
     return full_size_KB(shape=shape, axis=0, dtype=dtype) < system_free_memory().kb()

mantidimaging/gui/windows/main/test/view_test.py

@@ -23,8 +23,7 @@
 class MainWindowViewTest(unittest.TestCase):
     def setUp(self) -> None:
         with mock.patch("mantidimaging.gui.windows.main.view.WelcomeScreenPresenter"):
-            with mock.patch("mantidimaging.gui.windows.main.view.has_other_shared_arrays", return_value=False):
-                self.view = MainWindowView()
+            self.view = MainWindowView()
         self.presenter = mock.MagicMock()
         self.view.presenter = self.presenter
 
@@ -307,34 +306,3 @@ def test_get_images_from_stack_uuid(self):
 
         self.presenter.get_stack_visualiser.assert_called_once_with(uuid)
         self.assertEqual(images, return_value)
-
-    @mock.patch("mantidimaging.gui.windows.main.view.has_other_shared_arrays")
-    @mock.patch("mantidimaging.gui.windows.main.view.free_all")
-    @mock.patch("mantidimaging.gui.windows.main.view.QMessageBox")
-    def test_ask_user_to_free_data(self, QMessageBox: Mock, free_all: Mock, has_other_shared_arrays: Mock):
-        has_other_shared_arrays.return_value = True
-        # makes the clickedButton the same return value mock as the addButton return
-        QMessageBox.return_value.clickedButton.return_value = QMessageBox.return_value.addButton.return_value
-
-        self.view.ask_user_to_free_data()
-
-        QMessageBox.return_value.setWindowTitle.assert_called_once()
-        QMessageBox.return_value.setText.assert_called_once()
-        self.assertEquals(QMessageBox.return_value.addButton.call_count, 2)
-        QMessageBox.return_value.exec.assert_called_once()
-        free_all.assert_called_once()
-
-    @mock.patch("mantidimaging.gui.windows.main.view.has_other_shared_arrays")
-    @mock.patch("mantidimaging.gui.windows.main.view.free_all")
-    @mock.patch("mantidimaging.gui.windows.main.view.QMessageBox")
-    def test_ask_user_to_free_data_ignore_pressed(self, QMessageBox: Mock, free_all: Mock,
-                                                  has_other_shared_arrays: Mock):
-        has_other_shared_arrays.return_value = True
-
-        self.view.ask_user_to_free_data()
-
-        QMessageBox.return_value.setWindowTitle.assert_called_once()
-        QMessageBox.return_value.setText.assert_called_once()
-        self.assertEquals(QMessageBox.return_value.addButton.call_count, 2)
-        QMessageBox.return_value.exec.assert_called_once()
-        free_all.assert_not_called()

mantidimaging/gui/windows/main/view.py

@@ -3,6 +3,7 @@
 
 import os
 from logging import getLogger
+from mantidimaging.core.utility.projection_angle_parser import ProjectionAngleFileParser
 from typing import Optional
 from uuid import UUID
 
@@ -88,23 +89,6 @@ def __init__(self):
         if WelcomeScreenPresenter.show_today():
             self.show_about()
 
-        if has_other_shared_arrays():
-            self.ask_user_to_free_data()
-
-    def ask_user_to_free_data(self):
-        msg_box = QMessageBox(self)
-        msg_box.setWindowTitle("Previously loaded data found")
-        msg_box.setText("This can happen if Mantid Imaging crashes, or there are multiple instances running.\n\n"
-                        "If Mantid Imaging crashed it is recommended to just 'Release all previous data'.\n\n"
-                        "If you have another instance running it is recommended you 'Ignore' "
-                        "otherwise the other instance will be corrupted.")
-        delete_all = msg_box.addButton("Release all previous data", QMessageBox.ActionRole)
-        _ = msg_box.addButton(QMessageBox.Ignore)
-        msg_box.exec()
-
-        if msg_box.clickedButton() == delete_all:
-            free_all()
-
     def setup_shortcuts(self):
         self.actionLoad.triggered.connect(self.show_load_dialogue)
         self.actionSampleLoadLog.triggered.connect(self.load_sample_log_dialog)

mantidimaging/gui/windows/operations/test/test_view.py

@@ -17,8 +17,7 @@ class OperationsWindowsViewTest(unittest.TestCase):
     def setUp(self):
         # mock the view so it has the same methods
         with mock.patch("mantidimaging.gui.windows.main.view.WelcomeScreenPresenter"):
-            with mock.patch("mantidimaging.gui.windows.main.view.has_other_shared_arrays", return_value=False):
-                self.main_window = MainWindowView()
+            self.main_window = MainWindowView()
         self.window = FiltersWindowView(self.main_window)
 
     def test_collapse(self):

mantidimaging/gui/windows/recon/test/view_test.py

@@ -19,8 +19,7 @@
 class ReconstructWindowViewTest(unittest.TestCase):
     def setUp(self) -> None:
         with mock.patch("mantidimaging.gui.windows.main.view.WelcomeScreenPresenter"):
-            with mock.patch("mantidimaging.gui.windows.main.view.has_other_shared_arrays", return_value=False):
-                self.main_window = MainWindowView()
+            self.main_window = MainWindowView()
         self.view = ReconstructWindowView(self.main_window)
         self.view.presenter = self.presenter = mock.Mock()
         self.view.image_view = self.image_view = mock.Mock()

mantidimaging/gui/windows/stack_visualiser/test/view_test.py

@@ -5,8 +5,9 @@
 import unittest
 
 from unittest import mock
+from unittest.mock import Mock
+
 from PyQt5.QtWidgets import QDockWidget
-from mock import Mock
 
 import mantidimaging.test_helpers.unit_test_helper as th
 from mantidimaging.core.data import Images
@@ -34,8 +35,7 @@ def tearDown(self) -> None:
 
     def setUp(self):
         with mock.patch("mantidimaging.gui.windows.main.view.WelcomeScreenPresenter"):
-            with mock.patch("mantidimaging.gui.windows.main.view.has_other_shared_arrays", return_value=False):
-                self.window = MainWindowView()
+            self.window = MainWindowView()
         self.window.remove_stack = mock.Mock()
         self.dock, self.view, self.test_data = self._add_stack_visualiser()