From f76291cb01e6ed7f90c610f496ec59d55f33a099 Mon Sep 17 00:00:00 2001
From: Conor Finn <conor.finn@stfc.ac.uk>
Date: Tue, 28 Jan 2020 15:25:10 +0000
Subject: [PATCH] RE #27724 Update tests to account for changes
---
.../tabs/calibration/test/test_calib_model.py | 4 ++--
.../tabs/calibration/test/test_calib_presenter.py | 4 +---
.../tabs/focus/test/test_focus_presenter.py | 2 +-
3 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/scripts/Engineering/gui/engineering_diffraction/tabs/calibration/test/test_calib_model.py b/scripts/Engineering/gui/engineering_diffraction/tabs/calibration/test/test_calib_model.py
index d82d2152b93..d687782b9c7 100644
--- a/scripts/Engineering/gui/engineering_diffraction/tabs/calibration/test/test_calib_model.py
+++ b/scripts/Engineering/gui/engineering_diffraction/tabs/calibration/test/test_calib_model.py
@@ -187,9 +187,9 @@ class CalibrationModelTest(unittest.TestCase):
self.assertEqual(write_file.call_count, 3)
write_file.assert_called_with("test/" + filename, [0], [1],
bank_names=['South'],
- ceria_run=sample_path,
+ ceria_run="20",
template_file="template_ENGINX_241391_236516_South_bank.prm",
- vanadium_run=vanadium_path)
+ vanadium_run="10")
def test_generate_table_workspace_name(self):
self.assertEqual(self.model._generate_table_workspace_name(20),
diff --git a/scripts/Engineering/gui/engineering_diffraction/tabs/calibration/test/test_calib_presenter.py b/scripts/Engineering/gui/engineering_diffraction/tabs/calibration/test/test_calib_presenter.py
index a3f96bc4f8b..cfb77df2dac 100644
--- a/scripts/Engineering/gui/engineering_diffraction/tabs/calibration/test/test_calib_presenter.py
+++ b/scripts/Engineering/gui/engineering_diffraction/tabs/calibration/test/test_calib_presenter.py
@@ -119,13 +119,11 @@ class CalibrationPresenterTest(unittest.TestCase):
self.view.set_check_plot_output_enabled.assert_called_with(True)
@patch(tab_path + ".presenter.CalibrationPresenter.emit_enable_button_signal")
- @patch(tab_path + ".presenter.logger.warning")
- def test_on_error_posts_to_logger_and_enables_controls(self, logger, emit):
+ def test_on_error_posts_to_logger_and_enables_controls(self, emit):
fail_info = 2024278
self.presenter._on_error(fail_info)
- logger.assert_called_with(str(fail_info))
self.assertEqual(emit.call_count, 1)
def test_validation_of_run_numbers(self):
diff --git a/scripts/Engineering/gui/engineering_diffraction/tabs/focus/test/test_focus_presenter.py b/scripts/Engineering/gui/engineering_diffraction/tabs/focus/test/test_focus_presenter.py
index 9efb66904b0..4ced5e5601a 100644
--- a/scripts/Engineering/gui/engineering_diffraction/tabs/focus/test/test_focus_presenter.py
+++ b/scripts/Engineering/gui/engineering_diffraction/tabs/focus/test/test_focus_presenter.py
@@ -76,7 +76,7 @@ class FocusPresenterTest(unittest.TestCase):
self.view.set_plot_output_enabled.assert_called_with(True)
@patch(tab_path + ".presenter.FocusPresenter.emit_enable_button_signal")
- def test_on_worker_error_posts_to_logger_and_enables_controls(self, emit):
+ def test_on_worker_error_enables_controls(self, emit):
fail_info = 2024278
self.presenter._on_worker_error(fail_info)
--
GitLab