Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/11118_isis_indirect_tests_any_fa…
Browse files Browse the repository at this point in the history
…cility'
  • Loading branch information
AndreiSavici committed Feb 18, 2015
2 parents c6e684b + 0c9bef1 commit 94b94b8
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 0 deletions.
5 changes: 5 additions & 0 deletions Code/Mantid/scripts/test/IndirectApplyCorrectionsTest.py
Expand Up @@ -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 = ''
Expand All @@ -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()
Expand Down
1 change: 1 addition & 0 deletions Code/Mantid/scripts/test/IndirectCommonTests.py
Expand Up @@ -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
Expand Down

0 comments on commit 94b94b8

Please sign in to comment.