From 0c9bef16758351bd0f2491a5cb3d4dcb28aa6208 Mon Sep 17 00:00:00 2001 From: Dan Nixon Date: Wed, 18 Feb 2015 15:56:19 +0000 Subject: [PATCH] Set and restore default facility in ISIS indirect tests Refs #11118 --- Code/Mantid/scripts/test/IndirectApplyCorrectionsTest.py | 5 +++++ Code/Mantid/scripts/test/IndirectCommonTests.py | 1 + 2 files changed, 6 insertions(+) diff --git a/Code/Mantid/scripts/test/IndirectApplyCorrectionsTest.py b/Code/Mantid/scripts/test/IndirectApplyCorrectionsTest.py index 6c99dc274fa5..3d1762cdc58c 100644 --- a/Code/Mantid/scripts/test/IndirectApplyCorrectionsTest.py +++ b/Code/Mantid/scripts/test/IndirectApplyCorrectionsTest.py @@ -30,6 +30,9 @@ def _decorator(self, *args, **kwargs): class ApplyCorrectionsTests(unittest.TestCase): def setUp(self): + self._config_defaults = config + config['default.facility'] = 'ISIS' + self._sample_workspace = self.make_sample_workspace() self._can_workspace = '' self._corrections_workspace = '' @@ -49,6 +52,8 @@ def tearDown(self): mtd.clear() self.clean_up_saved_workspaces() + config = self._config_defaults + @setup_can_test def test_with_can_workspace(self): output_workspaces = self.run_apply_corrections() diff --git a/Code/Mantid/scripts/test/IndirectCommonTests.py b/Code/Mantid/scripts/test/IndirectCommonTests.py index db4249d96b49..edc6c68b6fc8 100644 --- a/Code/Mantid/scripts/test/IndirectCommonTests.py +++ b/Code/Mantid/scripts/test/IndirectCommonTests.py @@ -16,6 +16,7 @@ class IndirectCommonTests(unittest.TestCase): def setUp(self): self._config_defaults = config + config['default.facility'] = 'ISIS' def tearDown(self): config = self._config_defaults