diff --git a/Testing/PerformanceTests/sqlresults.py b/Testing/PerformanceTests/sqlresults.py
index 963d3c40effbe2fe97eb15d9508fe2c7d5bc22ec..97d69f659c8c634fef7f27ce18cc7a63310c3b34 100644
--- a/Testing/PerformanceTests/sqlresults.py
+++ b/Testing/PerformanceTests/sqlresults.py
@@ -252,7 +252,7 @@ def setup_database():
###########################################################################
-# A class to report the results of stress tests to the Mantid Test database
+# A class to report the results of system tests to the Mantid Test database
# (requires sqlite3 module)
###########################################################################
class SQLResultReporter(reporters.ResultReporter):
diff --git a/Testing/SystemTests/lib/systemtests/stresstesting.py b/Testing/SystemTests/lib/systemtests/systemtesting.py
similarity index 98%
rename from Testing/SystemTests/lib/systemtests/stresstesting.py
rename to Testing/SystemTests/lib/systemtests/systemtesting.py
index 01adf6fd7f46e1eeb9975d6212c43bd3335b661a..ccb47e4e68d27616cd4ee9e06efc6c5b31ac8f27 100644
--- a/Testing/SystemTests/lib/systemtests/stresstesting.py
+++ b/Testing/SystemTests/lib/systemtests/systemtesting.py
@@ -4,13 +4,13 @@
# NScD Oak Ridge National Laboratory, European Spallation Source
# & Institut Laue - Langevin
# SPDX - License - Identifier: GPL - 3.0 +
-'''
-Mantid stress testing framework. This module contains all of the necessary code
-to run sets of stress tests on the Mantid framework by executing scripts directly
+"""
+Mantid system testing framework. This module contains all of the necessary code
+to run sets of system tests on the Mantid framework by executing scripts directly
or by importing them into MantidPlot.
File change history is stored at: <https://github.com/mantidproject/systemtests>.
-'''
+"""
from __future__ import (absolute_import, division, print_function)
from six import PY3
import datetime
@@ -44,8 +44,8 @@ TESTING_FRAMEWORK_DIR = THIS_MODULE_DIR.replace('\\', '\\\\')
#########################################################################
# The base test class.
#########################################################################
-class MantidStressTest(unittest.TestCase):
- '''Defines a base class for stress tests, providing functions
+class MantidSystemTest(unittest.TestCase):
+ '''Defines a base class for system tests, providing functions
that should be overridden by inheriting classes to perform tests.
'''
@@ -56,7 +56,7 @@ class MantidStressTest(unittest.TestCase):
PREFIX = 'RESULT'
def __init__(self):
- super(MantidStressTest, self).__init__()
+ super(MantidSystemTest, self).__init__()
# A list of things not to check when validating
self.disableChecking = []
# Whether or not to strip off whitespace when doing simple ascii diff
@@ -721,8 +721,8 @@ class TestSuite(object):
all_lines = output.split('\n')
# Find the test results
for line in all_lines:
- entries = line.split(MantidStressTest.DELIMITER)
- if len(entries) == 3 and entries[0] == MantidStressTest.PREFIX:
+ entries = line.split(MantidSystemTest.DELIMITER)
+ if len(entries) == 3 and entries[0] == MantidSystemTest.PREFIX:
self._result.addItem([entries[1], entries[2]])
def setOutputMsg(self, msg=None):
@@ -797,7 +797,7 @@ class TestManager(object):
if len(reduced_test_list) == 0:
print('No tests defined in ' + test_dir +
- '. Please ensure all test classes sub class stresstesting.MantidStressTest.')
+ '. Please ensure all test classes sub class systemtesting.MantidSystemTest.')
exit(2)
test_stats[0] = len(reduced_test_list)
@@ -966,7 +966,7 @@ class TestManager(object):
mod_attrs = dir(mod)
for key in mod_attrs:
value = getattr(mod, key)
- if key is "MantidStressTest" or not inspect.isclass(value):
+ if key is "MantidSystemTest" or not inspect.isclass(value):
continue
if self.isValidTestClass(value):
test_name = key
@@ -982,9 +982,9 @@ class TestManager(object):
def isValidTestClass(self, class_obj):
"""Returns true if the test is a valid test class. It is valid
- if: the class subclassses MantidStressTest and has no abstract methods
+ if: the class subclassses MantidSystemTest and has no abstract methods
"""
- if not issubclass(class_obj, MantidStressTest):
+ if not issubclass(class_obj, MantidSystemTest):
return False
# Check if the get_reference_file is abstract or not
if hasattr(class_obj, "__abstractmethods__"):
@@ -1006,7 +1006,7 @@ class MantidFrameworkConfig:
loglevel='information', archivesearch=False):
self.__sourceDir = self.__locateSourceDir(sourceDir)
- # add location of stress tests
+ # add location of system tests
self.__testDir = self.__locateTestsDir()
# add location of the analysis tests
diff --git a/Testing/SystemTests/lib/systemtests/xmlreporter.py b/Testing/SystemTests/lib/systemtests/xmlreporter.py
index d198b2f8fed448cfe171a063fbe8fe1f51abd878..fd08f08e0d075533f613373be6edb55e851e77ce 100644
--- a/Testing/SystemTests/lib/systemtests/xmlreporter.py
+++ b/Testing/SystemTests/lib/systemtests/xmlreporter.py
@@ -8,9 +8,9 @@ from __future__ import (absolute_import, division, print_function)
import os
import sys
from xml.dom.minidom import getDOMImplementation
-import stresstesting
+import systemtesting
-class XmlResultReporter(stresstesting.ResultReporter):
+class XmlResultReporter(systemtesting.ResultReporter):
_time_taken = 0.0
_failures = []
diff --git a/Testing/SystemTests/scripts/performance/sqlresults.py b/Testing/SystemTests/scripts/performance/sqlresults.py
index 7216eecda5733a51c8db85edd8785461239f4af1..e9a5bbda6fe89a4862eb5d254b11d144c1820509 100644
--- a/Testing/SystemTests/scripts/performance/sqlresults.py
+++ b/Testing/SystemTests/scripts/performance/sqlresults.py
@@ -252,7 +252,7 @@ def setup_database():
###########################################################################
-# A class to report the results of stress tests to the Mantid Test database
+# A class to report the results of system tests to the Mantid Test database
# (requires sqlite3 module)
###########################################################################
class SQLResultReporter(reporters.ResultReporter):
diff --git a/Testing/SystemTests/scripts/runSystemTests.py b/Testing/SystemTests/scripts/runSystemTests.py
index 571412cf913e154ab3793bbf53295a7483955315..585333f81445fda14f9516f9c7f15b1d45c94fc8 100755
--- a/Testing/SystemTests/scripts/runSystemTests.py
+++ b/Testing/SystemTests/scripts/runSystemTests.py
@@ -45,7 +45,7 @@ if __name__ == "__main__":
parser.add_option("-a", "--exec-args", dest="execargs",
help="Arguments passed to executable for each test Default=[]")
parser.add_option("", "--frameworkLoc",
- help="location of the stress test framework (default=%s)" % DEFAULT_FRAMEWORK_LOC)
+ help="location of the system test framework (default=%s)" % DEFAULT_FRAMEWORK_LOC)
parser.add_option("", "--disablepropmake", action="store_false", dest="makeprop",
help="By default this will move your properties file out of the "
+ "way and create a new one. This option turns off this behavior.")
@@ -79,9 +79,9 @@ if __name__ == "__main__":
loglevel="information", ncores=1, quiet=False, output_on_failure=False, clean=False)
(options, args) = parser.parse_args()
- # import the stress testing framework
+ # import the system testing framework
sys.path.append(options.frameworkLoc)
- import stresstesting
+ import systemtesting
#########################################################################
# Configure mantid
@@ -99,7 +99,7 @@ if __name__ == "__main__":
save_dir = f_handle.read().strip()
# Configure properties file
- mtdconf = stresstesting.MantidFrameworkConfig(loglevel=options.loglevel,
+ mtdconf = systemtesting.MantidFrameworkConfig(loglevel=options.loglevel,
data_dirs=data_paths,
save_dir=save_dir,
archivesearch=options.archivesearch)
@@ -110,11 +110,11 @@ if __name__ == "__main__":
# Generate list of tests
#########################################################################
- runner = stresstesting.TestRunner(executable=options.executable,
+ runner = systemtesting.TestRunner(executable=options.executable,
exec_args=options.execargs,
escape_quotes=True)
- tmgr = stresstesting.TestManager(test_loc=mtdconf.testDir,
+ tmgr = systemtesting.TestManager(test_loc=mtdconf.testDir,
runner=runner,
quiet=options.quiet,
testsInclude=options.testsInclude,
@@ -185,7 +185,7 @@ if __name__ == "__main__":
# Prepare ncores processes
for ip in range(options.ncores):
- processes.append(Process(target=stresstesting.testThreadsLoop,args=(mtdconf.testDir, mtdconf.saveDir,
+ processes.append(Process(target=systemtesting.testThreadsLoop,args=(mtdconf.testDir, mtdconf.saveDir,
mtdconf.dataDir, options, tests_dict, tests_lock, tests_left, results_array,
status_dict, total_number_of_tests, maximum_name_length, tests_done, ip, lock,
required_files_dict, locked_files_dict)))
diff --git a/Testing/SystemTests/tests/analysis/ARCSReductionTest.py b/Testing/SystemTests/tests/analysis/ARCSReductionTest.py
index 167d9022e6b2555b52c18f9e75fc1442d250f881..4001d0efd4f788ff2b40e6f6eff67f26c931865e 100644
--- a/Testing/SystemTests/tests/analysis/ARCSReductionTest.py
+++ b/Testing/SystemTests/tests/analysis/ARCSReductionTest.py
@@ -10,11 +10,11 @@ System test for ARCS reduction
"""
import os
-import stresstesting
+import systemtesting
from mantid.simpleapi import *
-class ARCSReductionTest(stresstesting.MantidStressTest):
+class ARCSReductionTest(systemtesting.MantidSystemTest):
vanFile1=''
vanFile0=''
diff --git a/Testing/SystemTests/tests/analysis/AbinsTest.py b/Testing/SystemTests/tests/analysis/AbinsTest.py
index 03b1b2666ac6031b5639da2cfb53a38c970ce18b..0886c66a1425108f89d39c7d7829c2ddf2d25751 100644
--- a/Testing/SystemTests/tests/analysis/AbinsTest.py
+++ b/Testing/SystemTests/tests/analysis/AbinsTest.py
@@ -5,7 +5,7 @@
# & Institut Laue - Langevin
# SPDX - License - Identifier: GPL - 3.0 +
from __future__ import (absolute_import, division, print_function)
-import stresstesting
+import systemtesting
from mantid.simpleapi import Abins, mtd, DeleteWorkspace
from AbinsModules import AbinsConstants, AbinsTestHelpers
@@ -160,7 +160,7 @@ class HelperTestingClass(object):
# ----------------------------------------------------------------------------------------------------------------
-class AbinsCRYSTALTestScratch(stresstesting.MantidStressTest, HelperTestingClass):
+class AbinsCRYSTALTestScratch(systemtesting.MantidSystemTest, HelperTestingClass):
"""
In this benchmark it is tested if calculation from scratch with input data from CRYSTAL and for 1-4 quantum
order events is correct.
@@ -190,7 +190,7 @@ class AbinsCRYSTALTestScratch(stresstesting.MantidStressTest, HelperTestingClass
# ----------------------------------------------------------------------------------------------------------------
-class AbinsCRYSTALTestBiggerSystem(stresstesting.MantidStressTest, HelperTestingClass):
+class AbinsCRYSTALTestBiggerSystem(systemtesting.MantidSystemTest, HelperTestingClass):
"""
In this benchmark it is tested if calculation from scratch with input data from CRYSTAL and for only 1 quantum
order event is correct.
@@ -217,7 +217,7 @@ class AbinsCRYSTALTestBiggerSystem(stresstesting.MantidStressTest, HelperTesting
# ----------------------------------------------------------------------------------------------------------------
-class AbinsCRYSTALTestT(stresstesting.MantidStressTest, HelperTestingClass):
+class AbinsCRYSTALTestT(systemtesting.MantidSystemTest, HelperTestingClass):
"""
In this benchmark scenario of restart is considered in which data for other temperature already exists in an hdf
file. In this benchmark input data from CRYSTAL DFT program is used.
@@ -247,7 +247,7 @@ class AbinsCRYSTALTestT(stresstesting.MantidStressTest, HelperTestingClass):
# ----------------------------------------------------------------------------------------------------------------
-class AbinsCRYSTALTestLargerOrder(stresstesting.MantidStressTest, HelperTestingClass):
+class AbinsCRYSTALTestLargerOrder(systemtesting.MantidSystemTest, HelperTestingClass):
"""
In this benchmark it is tested if calculation from restart with input data from CRYSTAL is correct. Requested order
of quantum event is larger than the one which is saved to an hdf file so S has to be calculated.
@@ -277,7 +277,7 @@ class AbinsCRYSTALTestLargerOrder(stresstesting.MantidStressTest, HelperTestingC
# ----------------------------------------------------------------------------------------------------------------
-class AbinsCRYSTALTestSmallerOrder(stresstesting.MantidStressTest, HelperTestingClass):
+class AbinsCRYSTALTestSmallerOrder(systemtesting.MantidSystemTest, HelperTestingClass):
"""
In this benchmark it is tested if calculation from restart with input data from CRYSTAL is correct. Requested
order of quantum event is smaller than the one which is saved to an hdf file so S is loaded from an hdf file.
@@ -301,7 +301,7 @@ class AbinsCRYSTALTestSmallerOrder(stresstesting.MantidStressTest, HelperTesting
return self._output_name, self.ref_result
-class AbinsCRYSTALTestScale(stresstesting.MantidStressTest, HelperTestingClass):
+class AbinsCRYSTALTestScale(systemtesting.MantidSystemTest, HelperTestingClass):
"""
In this benchmark it is tested if scaling is correct.
"""
@@ -329,7 +329,7 @@ class AbinsCRYSTALTestScale(stresstesting.MantidStressTest, HelperTestingClass):
# noinspection PyAttributeOutsideInit,PyPep8Naming
-class AbinsCASTEPNoH(stresstesting.MantidStressTest, HelperTestingClass):
+class AbinsCASTEPNoH(systemtesting.MantidSystemTest, HelperTestingClass):
"""
In this benchmark it is tested if calculation for systems without H is correct.
"""
@@ -354,7 +354,7 @@ class AbinsCASTEPNoH(stresstesting.MantidStressTest, HelperTestingClass):
# noinspection PyAttributeOutsideInit,PyPep8Naming
-class AbinsCASTEP1DDispersion(stresstesting.MantidStressTest, HelperTestingClass):
+class AbinsCASTEP1DDispersion(systemtesting.MantidSystemTest, HelperTestingClass):
"""
In this benchmark it is tested if calculation of S from phonon dispersion is correct (1D case).
"""
@@ -378,7 +378,7 @@ class AbinsCASTEP1DDispersion(stresstesting.MantidStressTest, HelperTestingClass
return self._output_name, self.ref_result
-class AbinsDMOL3TestScratch(stresstesting.MantidStressTest, HelperTestingClass):
+class AbinsDMOL3TestScratch(systemtesting.MantidSystemTest, HelperTestingClass):
"""
In this benchmark it is tested if calculation from scratch with input data from DMOL3 and for 1-4 quantum
order events is correct.
@@ -406,7 +406,7 @@ class AbinsDMOL3TestScratch(stresstesting.MantidStressTest, HelperTestingClass):
return self._output_name, self.ref_result
-class AbinsGAUSSIANestScratch(stresstesting.MantidStressTest, HelperTestingClass):
+class AbinsGAUSSIANestScratch(systemtesting.MantidSystemTest, HelperTestingClass):
"""
In this benchmark it is tested if calculation from scratch with input data from GAUSSIAN and for 1-4 quantum
order events is correct.
@@ -434,7 +434,7 @@ class AbinsGAUSSIANestScratch(stresstesting.MantidStressTest, HelperTestingClass
return self._output_name, self.ref_result
-class AbinsBinWidth(stresstesting.MantidStressTest, HelperTestingClass):
+class AbinsBinWidth(systemtesting.MantidSystemTest, HelperTestingClass):
"""
In this benchmark it is tested if calculation with bin width different than the default value is correct.
Calculation performed for crystalline benzene for 1st and 2nd quantum event for output from CASTEP and bin width
@@ -459,7 +459,7 @@ class AbinsBinWidth(stresstesting.MantidStressTest, HelperTestingClass):
return self._output_name, self.ref_result
-class AbinsCASTEPIsotopes(stresstesting.MantidStressTest, HelperTestingClass):
+class AbinsCASTEPIsotopes(systemtesting.MantidSystemTest, HelperTestingClass):
"""
In this benchmark it is tested if calculation of the system with isotopic substitutions: H -> 2H, Li -> 7Li,
produces correct results. Input data is generated by CASTEP. This system test should be fast so no need for
diff --git a/Testing/SystemTests/tests/analysis/BASISTest.py b/Testing/SystemTests/tests/analysis/BASISTest.py
index afa665f4f04994a5db7adc3f3ea4b09c0b4ae39d..3b98aa7d82be6bd3b90f32063cc7fc610c673caa 100644
--- a/Testing/SystemTests/tests/analysis/BASISTest.py
+++ b/Testing/SystemTests/tests/analysis/BASISTest.py
@@ -6,7 +6,7 @@
# SPDX - License - Identifier: GPL - 3.0 +
from __future__ import (absolute_import, division, print_function)
-import stresstesting
+import systemtesting
from mantid import config
from mantid.simpleapi import (BASISCrystalDiffraction, Load, GroupWorkspaces,
ElasticWindowMultiple, MSDFit,
@@ -29,7 +29,7 @@ class PreppingMixin(object):
config[key] = value # config object does not have update method like python dict
-class ElwinTest(stresstesting.MantidStressTest, PreppingMixin):
+class ElwinTest(systemtesting.MantidSystemTest, PreppingMixin):
r"""ELWIN tab of the Indirect Inelastic Interface
"""
@@ -77,7 +77,7 @@ class ElwinTest(stresstesting.MantidStressTest, PreppingMixin):
return 'outQ2', 'BASIS_elwin_eq2.nxs'
-class GaussianMSDTest(stresstesting.MantidStressTest, PreppingMixin):
+class GaussianMSDTest(systemtesting.MantidSystemTest, PreppingMixin):
r"""MSD tab of the Indirect Inelastic Interface
"""
@@ -113,7 +113,7 @@ class GaussianMSDTest(stresstesting.MantidStressTest, PreppingMixin):
return 'outMSD', 'BASIS_63652_63720_Gaussian_msd.nxs'
-class CrystalDiffractionTest(stresstesting.MantidStressTest, PreppingMixin):
+class CrystalDiffractionTest(systemtesting.MantidSystemTest, PreppingMixin):
r"""Reduction for a scan of runs probing different orientations of a crystal.
"""
@@ -164,7 +164,7 @@ class CrystalDiffractionTest(stresstesting.MantidStressTest, PreppingMixin):
return 'peaky', 'BASISOrientedSample.nxs'
-class PowderSampleTest(stresstesting.MantidStressTest, PreppingMixin):
+class PowderSampleTest(systemtesting.MantidSystemTest, PreppingMixin):
r"""Run a elastic reduction for powder sample"""
def __init__(self):
diff --git a/Testing/SystemTests/tests/analysis/BuildSQWTest.py b/Testing/SystemTests/tests/analysis/BuildSQWTest.py
index 7f65d682d86d25fb880fc5c8b18b58ad835ef4a4..1c2c4ef4f877d48dda12b0308fbf313e1da032d4 100644
--- a/Testing/SystemTests/tests/analysis/BuildSQWTest.py
+++ b/Testing/SystemTests/tests/analysis/BuildSQWTest.py
@@ -14,7 +14,7 @@
repository & required to be accessible from any machine that wishes to run the test.
"""
from __future__ import (absolute_import, division, print_function)
-import stresstesting
+import systemtesting
import os
from mantid.simpleapi import *
@@ -22,7 +22,7 @@ from mantid.simpleapi import *
FILE_LOCATIONS = ["/isis/mantid/localtestdata/"]#,"d:/Data/MantidSystemTests/BigData/Dropbox/LoadSQW"]
-class BuildSQWTest(stresstesting.MantidStressTest):
+class BuildSQWTest(systemtesting.MantidSystemTest):
_startrun = 15058
_endrun = 15178
diff --git a/Testing/SystemTests/tests/analysis/CNCSReductionTest.py b/Testing/SystemTests/tests/analysis/CNCSReductionTest.py
index 998c30bce030b5ad15a172e34b356a36804c2ec6..bfc7ac727a1a719887195d1c42663f496dd0e94a 100644
--- a/Testing/SystemTests/tests/analysis/CNCSReductionTest.py
+++ b/Testing/SystemTests/tests/analysis/CNCSReductionTest.py
@@ -10,11 +10,11 @@ System test for CNCS reduction
"""
import os
-import stresstesting
+import systemtesting
from mantid.simpleapi import *
-class CNCSReductionTest(stresstesting.MantidStressTest):
+class CNCSReductionTest(systemtesting.MantidSystemTest):
parFile=''
groupingFile=''
nxspeFile=''
diff --git a/Testing/SystemTests/tests/analysis/CalMuonDeadTimeTest.py b/Testing/SystemTests/tests/analysis/CalMuonDeadTimeTest.py
index e9d9ca7bbba3fbe27a5801a56f82e9a02d936898..74a2ad9b6afe38caf483c5efd6d8a6c12aec9b3d 100644
--- a/Testing/SystemTests/tests/analysis/CalMuonDeadTimeTest.py
+++ b/Testing/SystemTests/tests/analysis/CalMuonDeadTimeTest.py
@@ -5,11 +5,11 @@
# & Institut Laue - Langevin
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init,attribute-defined-outside-init
-import stresstesting
+import systemtesting
from mantid.simpleapi import *
-class CalMuonDeadTimeTest(stresstesting.MantidStressTest):
+class CalMuonDeadTimeTest(systemtesting.MantidSystemTest):
'''Tests the CalMuonDeadTime algorithm'''
def runTest(self):
diff --git a/Testing/SystemTests/tests/analysis/CalibrateRectangularDetector_Test.py b/Testing/SystemTests/tests/analysis/CalibrateRectangularDetector_Test.py
index e778446493f344a5a0b43f2e083651c98dc0b322..5d3a9cc04e4964341a979ab8351dd7a3d07543bf 100644
--- a/Testing/SystemTests/tests/analysis/CalibrateRectangularDetector_Test.py
+++ b/Testing/SystemTests/tests/analysis/CalibrateRectangularDetector_Test.py
@@ -6,7 +6,7 @@
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=invalid-name,no-init,attribute-defined-outside-init
from __future__ import (absolute_import, division, print_function)
-import stresstesting
+import systemtesting
import os
from mantid.simpleapi import *
from six import string_types
@@ -23,7 +23,7 @@ def _skip_test():
return "Linux" not in platform.platform()
-class PG3Calibration(stresstesting.MantidStressTest):
+class PG3Calibration(systemtesting.MantidSystemTest):
def cleanup(self):
os.remove(self.saved_cal_file)
@@ -71,7 +71,7 @@ class PG3Calibration(stresstesting.MantidStressTest):
return ('PG3_2538_offsets','PG3_2538_golden_offsets')
-class PG3CCCalibration(stresstesting.MantidStressTest):
+class PG3CCCalibration(systemtesting.MantidSystemTest):
def cleanup(self):
os.remove(self.saved_cal_file)
diff --git a/Testing/SystemTests/tests/analysis/CodeConventions.py b/Testing/SystemTests/tests/analysis/CodeConventions.py
index ebd33763370dc6ebbec33a1339d29161ac2b8c96..6587b6695fac42c6991f9b78db6ded8a99f6301d 100644
--- a/Testing/SystemTests/tests/analysis/CodeConventions.py
+++ b/Testing/SystemTests/tests/analysis/CodeConventions.py
@@ -6,7 +6,7 @@
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init
from __future__ import (absolute_import, division, print_function)
-import stresstesting
+import systemtesting
import re
import mantid
from mantid.simpleapi import *
@@ -81,7 +81,7 @@ FUNC_BAD_PARAMS = {
}
-class Algorithms(stresstesting.MantidStressTest):
+class Algorithms(systemtesting.MantidSystemTest):
def __init__(self):
super(Algorithms, self).__init__()
@@ -167,7 +167,7 @@ class Algorithms(stresstesting.MantidStressTest):
return True
-class FitFunctions(stresstesting.MantidStressTest):
+class FitFunctions(systemtesting.MantidSystemTest):
def __init__(self):
super(FitFunctions, self).__init__()
self.__ranOk = 0
diff --git a/Testing/SystemTests/tests/analysis/CompressEvents.py b/Testing/SystemTests/tests/analysis/CompressEvents.py
index 955e20060e199ab8904c5dd80944d067525beea7..5c87f1b6c6e4c341d61c37a6656d2d27dfae1937 100644
--- a/Testing/SystemTests/tests/analysis/CompressEvents.py
+++ b/Testing/SystemTests/tests/analysis/CompressEvents.py
@@ -5,11 +5,11 @@
# & Institut Laue - Langevin
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init,invalid-name,attribute-defined-outside-init
-import stresstesting
+import systemtesting
from mantid.simpleapi import *
-class CompressEventsTesting(stresstesting.MantidStressTest):
+class CompressEventsTesting(systemtesting.MantidSystemTest):
event_files = ["PG3_4844_event.nxs"] # /SNS/PG3/IPTS-2767/0/ for 2.5 hours
def requiredFiles(self):
diff --git a/Testing/SystemTests/tests/analysis/ConvertMultipleRunsToSingleCrystalMDTest.py b/Testing/SystemTests/tests/analysis/ConvertMultipleRunsToSingleCrystalMDTest.py
index c1f4a885ee1601811a632de4ffed166b81b1ce56..2ef6edef0149780acc1ddbb339175a727c09b2fb 100644
--- a/Testing/SystemTests/tests/analysis/ConvertMultipleRunsToSingleCrystalMDTest.py
+++ b/Testing/SystemTests/tests/analysis/ConvertMultipleRunsToSingleCrystalMDTest.py
@@ -4,11 +4,11 @@
# NScD Oak Ridge National Laboratory, European Spallation Source
# & Institut Laue - Langevin
# SPDX - License - Identifier: GPL - 3.0 +
-import stresstesting
+import systemtesting
from mantid.simpleapi import ConvertMultipleRunsToSingleCrystalMD, Load, AlgorithmManager, SaveMD
-class ConvertMultipleRunsToSingleCrystalMDQSampleTest(stresstesting.MantidStressTest):
+class ConvertMultipleRunsToSingleCrystalMDQSampleTest(systemtesting.MantidSystemTest):
def requiredFiles(self):
return ["CORELLI_29782.nxs","CORELLI_29792.nxs"]
@@ -43,7 +43,7 @@ class ConvertMultipleRunsToSingleCrystalMDQSampleTest(stresstesting.MantidStress
return True
-class ConvertMultipleRunsToSingleCrystalMDHKLTest(stresstesting.MantidStressTest):
+class ConvertMultipleRunsToSingleCrystalMDHKLTest(systemtesting.MantidSystemTest):
def requiredFiles(self):
return ["CORELLI_29782.nxs","CORELLI_29792.nxs",
"SingleCrystalDiffuseReduction_UB.mat"]
diff --git a/Testing/SystemTests/tests/analysis/ConvertToMDworkflow.py b/Testing/SystemTests/tests/analysis/ConvertToMDworkflow.py
index 5de54f8cd6703b14d191fae4dfa77d2695f4170f..1a839520fa60d0f68d66bf33e8a545c19e198756 100644
--- a/Testing/SystemTests/tests/analysis/ConvertToMDworkflow.py
+++ b/Testing/SystemTests/tests/analysis/ConvertToMDworkflow.py
@@ -6,12 +6,12 @@
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init
from __future__ import (absolute_import, division, print_function)
-import stresstesting
+import systemtesting
from mantid.simpleapi import *
#----------------------------------------------------------------------
-class ConvertToMDworkflow(stresstesting.MantidStressTest):
+class ConvertToMDworkflow(systemtesting.MantidSystemTest):
"""
"""
diff --git a/Testing/SystemTests/tests/analysis/ConvertWANDSCDtoQTest.py b/Testing/SystemTests/tests/analysis/ConvertWANDSCDtoQTest.py
index 6e11f0e62727a2cece6f5939b70f9c5db2f6cbb6..e3972e9d4f7eb1e0a6e40285474b6b48f269880a 100644
--- a/Testing/SystemTests/tests/analysis/ConvertWANDSCDtoQTest.py
+++ b/Testing/SystemTests/tests/analysis/ConvertWANDSCDtoQTest.py
@@ -4,12 +4,12 @@
# NScD Oak Ridge National Laboratory, European Spallation Source
# & Institut Laue - Langevin
# SPDX - License - Identifier: GPL - 3.0 +
-import stresstesting
+import systemtesting
import numpy as np
from mantid.simpleapi import *
-class ConvertWANDSCDtoQTest(stresstesting.MantidStressTest):
+class ConvertWANDSCDtoQTest(systemtesting.MantidSystemTest):
def requiredMemoryMB(self):
return 8000
diff --git a/Testing/SystemTests/tests/analysis/CountReflectionsTest.py b/Testing/SystemTests/tests/analysis/CountReflectionsTest.py
index 98960a511c82d501dd70af91bf5f2ebaa116e7b0..feff6bd5bfe06d591eb9a90ded64f4af8d24c2ce 100644
--- a/Testing/SystemTests/tests/analysis/CountReflectionsTest.py
+++ b/Testing/SystemTests/tests/analysis/CountReflectionsTest.py
@@ -5,12 +5,12 @@
# & Institut Laue - Langevin
# SPDX - License - Identifier: GPL - 3.0 +
from __future__ import (absolute_import, division, print_function)
-import stresstesting
+import systemtesting
from mantid.simpleapi import *
from SortHKLTest import HKLStatisticsTestMixin
-class CountReflectionsTest(HKLStatisticsTestMixin, stresstesting.MantidStressTest):
+class CountReflectionsTest(HKLStatisticsTestMixin, systemtesting.MantidSystemTest):
'''
This systemtest follows the same principle as the one for SortHKL. It loads data,
computes statistics and checks them against reference data obtained from another
diff --git a/Testing/SystemTests/tests/analysis/CrystalFieldPythonInterface.py b/Testing/SystemTests/tests/analysis/CrystalFieldPythonInterface.py
index a3e4ea5eaa97cb282fcfb694865e77c3f3a8dd3e..1767551aa7b91e986d3c8ee8a72d533225a16e29 100644
--- a/Testing/SystemTests/tests/analysis/CrystalFieldPythonInterface.py
+++ b/Testing/SystemTests/tests/analysis/CrystalFieldPythonInterface.py
@@ -5,14 +5,14 @@
# & Institut Laue - Langevin
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init
-from stresstesting import MantidStressTest
+from systemtesting import MantidSystemTest
from mantid.simpleapi import CreateWorkspace, LinearBackground, FlatBackground, Gaussian, CalculateChiSquared, mtd
from CrystalField.fitting import makeWorkspace
from PyChop import PyChop2
import numpy as np
-class CrystalFieldPythonInterface(MantidStressTest):
+class CrystalFieldPythonInterface(MantidSystemTest):
""" Runs all the commands in the crystal field python interface documentation file
This test only checks that the syntax of all the commands are still valid.
Unit tests for the individual functions / fitting procedure check for correctness.
diff --git a/Testing/SystemTests/tests/analysis/DOSTest.py b/Testing/SystemTests/tests/analysis/DOSTest.py
index 275aa85ea5d292e9a9628734e42e9a778321d049..9f14c3d4e1aedaa616685aaabf333dbe42c00ef4 100644
--- a/Testing/SystemTests/tests/analysis/DOSTest.py
+++ b/Testing/SystemTests/tests/analysis/DOSTest.py
@@ -6,7 +6,7 @@
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init,attribute-defined-outside-init
from __future__ import (absolute_import, division, print_function)
-import stresstesting
+import systemtesting
from mantid.kernel import *
from mantid.api import *
from mantid.simpleapi import *
@@ -14,7 +14,7 @@ from mantid.simpleapi import *
#------------------------------------------------------------------------------------
-class DOSPhononTest(stresstesting.MantidStressTest):
+class DOSPhononTest(systemtesting.MantidSystemTest):
def runTest(self):
file_name = 'squaricn.phonon'
@@ -33,7 +33,7 @@ class DOSPhononTest(stresstesting.MantidStressTest):
#------------------------------------------------------------------------------------
-class DOSPhononCrossSectionScaleTest(stresstesting.MantidStressTest):
+class DOSPhononCrossSectionScaleTest(systemtesting.MantidSystemTest):
def runTest(self):
file_name = 'squaricn.phonon'
@@ -53,7 +53,7 @@ class DOSPhononCrossSectionScaleTest(stresstesting.MantidStressTest):
#------------------------------------------------------------------------------------
-class DOSCastepTest(stresstesting.MantidStressTest):
+class DOSCastepTest(systemtesting.MantidSystemTest):
def runTest(self):
file_name = 'squaricn.castep'
@@ -72,7 +72,7 @@ class DOSCastepTest(stresstesting.MantidStressTest):
#------------------------------------------------------------------------------------
-class DOSRamanActiveTest(stresstesting.MantidStressTest):
+class DOSRamanActiveTest(systemtesting.MantidSystemTest):
def runTest(self):
file_name = 'squaricn.phonon'
@@ -94,7 +94,7 @@ class DOSRamanActiveTest(stresstesting.MantidStressTest):
#------------------------------------------------------------------------------------
-class DOSIRActiveTest(stresstesting.MantidStressTest):
+class DOSIRActiveTest(systemtesting.MantidSystemTest):
def runTest(self):
file_name = 'squaricn.phonon'
@@ -115,7 +115,7 @@ class DOSIRActiveTest(stresstesting.MantidStressTest):
#------------------------------------------------------------------------------------
-class DOSPartialTest(stresstesting.MantidStressTest):
+class DOSPartialTest(systemtesting.MantidSystemTest):
def runTest(self):
file_name = 'squaricn.phonon'
@@ -137,7 +137,7 @@ class DOSPartialTest(stresstesting.MantidStressTest):
#------------------------------------------------------------------------------------
-class DOSPartialSummedContributionsTest(stresstesting.MantidStressTest):
+class DOSPartialSummedContributionsTest(systemtesting.MantidSystemTest):
"""
This test checks the reference result of the total DOS against
the summed partial contributions of all elements. The two should be roughly
@@ -167,7 +167,7 @@ class DOSPartialSummedContributionsTest(stresstesting.MantidStressTest):
#------------------------------------------------------------------------------------
-class DOSPartialCrossSectionScaleTest(stresstesting.MantidStressTest):
+class DOSPartialCrossSectionScaleTest(systemtesting.MantidSystemTest):
def runTest(self):
file_name = 'squaricn.phonon'
@@ -190,7 +190,7 @@ class DOSPartialCrossSectionScaleTest(stresstesting.MantidStressTest):
#------------------------------------------------------------------------------------
-class DOSPartialSummedContributionsCrossSectionScaleTest(stresstesting.MantidStressTest):
+class DOSPartialSummedContributionsCrossSectionScaleTest(systemtesting.MantidSystemTest):
"""
This test checks the reference result of the total DOS against
the summed partial contributions of all elements. The two should be roughly
diff --git a/Testing/SystemTests/tests/analysis/Diffraction_Workflow_Test.py b/Testing/SystemTests/tests/analysis/Diffraction_Workflow_Test.py
index af679bf7a220783160e40329ade8b6c07ee793b0..2b20add2cf9a7f8e11a60c145a94061497101a9c 100644
--- a/Testing/SystemTests/tests/analysis/Diffraction_Workflow_Test.py
+++ b/Testing/SystemTests/tests/analysis/Diffraction_Workflow_Test.py
@@ -10,14 +10,14 @@ System test that loads TOPAZ single-crystal data,
and runs Diffraction Workflow.
"""
from __future__ import (absolute_import, division, print_function)
-import stresstesting
+import systemtesting
import numpy
import os
from mantid.simpleapi import *
from mantid.api import FileFinder
-class Diffraction_Workflow_Test(stresstesting.MantidStressTest):
+class Diffraction_Workflow_Test(systemtesting.MantidSystemTest):
def cleanup(self):
Files = ["TOPAZ_3132.hkl",
diff --git a/Testing/SystemTests/tests/analysis/DirectInelasticDiagnostic.py b/Testing/SystemTests/tests/analysis/DirectInelasticDiagnostic.py
index bef8d416257a925049cd5465230f50c091257a69..0c7bebad0f77aaebe707f15f591834a253364cf3 100644
--- a/Testing/SystemTests/tests/analysis/DirectInelasticDiagnostic.py
+++ b/Testing/SystemTests/tests/analysis/DirectInelasticDiagnostic.py
@@ -6,12 +6,12 @@
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init
import os
-from stresstesting import MantidStressTest
+from systemtesting import MantidSystemTest
import mantid.simpleapi as ms
import Direct.DirectEnergyConversion as reduction
-class DirectInelasticDiagnostic(MantidStressTest):
+class DirectInelasticDiagnostic(MantidSystemTest):
saved_diag_file=""
def requiredMemoryMB(self):
diff --git a/Testing/SystemTests/tests/analysis/DirectInelasticDiagnostic2.py b/Testing/SystemTests/tests/analysis/DirectInelasticDiagnostic2.py
index 89ece4fc602767c8567f02c16a8499cd519fd821..d9956f0ba07345ae30afe37a34275f2fa84d83ed 100644
--- a/Testing/SystemTests/tests/analysis/DirectInelasticDiagnostic2.py
+++ b/Testing/SystemTests/tests/analysis/DirectInelasticDiagnostic2.py
@@ -7,7 +7,7 @@
from __future__ import (absolute_import, division, print_function)
#pylint: disable=invalid-name,no-init
import os
-from stresstesting import MantidStressTest
+from systemtesting import MantidSystemTest
from mantid.simpleapi import *
from mantid.kernel import PropertyManager
from mantid import config
@@ -22,7 +22,7 @@ def getNamedParameter(ws, name):
return ws.getInstrument().getNumberParameter(name)[0]
-class DirectInelasticDiagnostic2(MantidStressTest):
+class DirectInelasticDiagnostic2(MantidSystemTest):
saved_diag_file=''
diff --git a/Testing/SystemTests/tests/analysis/EQSANSBeamCenterAPIv2.py b/Testing/SystemTests/tests/analysis/EQSANSBeamCenterAPIv2.py
index bedcc17e4fec7aab7893f7feafa83bd49a0826c2..91bf7ad96d125e0c6be5a5140b2684bc4903654c 100644
--- a/Testing/SystemTests/tests/analysis/EQSANSBeamCenterAPIv2.py
+++ b/Testing/SystemTests/tests/analysis/EQSANSBeamCenterAPIv2.py
@@ -5,7 +5,7 @@
# & Institut Laue - Langevin
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init,attribute-defined-outside-init
-import stresstesting
+import systemtesting
from mantid.simpleapi import *
from mantid.api import *
@@ -22,7 +22,7 @@ def do_cleanup():
return True
-class EQSANSBeamCenter(stresstesting.MantidStressTest):
+class EQSANSBeamCenter(systemtesting.MantidSystemTest):
def cleanup(self):
do_cleanup()
diff --git a/Testing/SystemTests/tests/analysis/EQSANSDarkCurrentAPIv2.py b/Testing/SystemTests/tests/analysis/EQSANSDarkCurrentAPIv2.py
index 73550296c0a97f7c1151b029ec5114c983e12e28..ccef446cfe3fd85d75288caeb85524e36c0bc4a9 100644
--- a/Testing/SystemTests/tests/analysis/EQSANSDarkCurrentAPIv2.py
+++ b/Testing/SystemTests/tests/analysis/EQSANSDarkCurrentAPIv2.py
@@ -5,7 +5,7 @@
# & Institut Laue - Langevin
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init,attribute-defined-outside-init
-import stresstesting
+import systemtesting
from mantid.simpleapi import *
from reduction_workflow.instruments.sans.sns_command_interface import *
from reduction_workflow.instruments.sans.hfir_command_interface import DarkCurrent,SetTransmission
@@ -14,7 +14,7 @@ from mantid.api import *
import os
-class EQSANSDarkCurrent(stresstesting.MantidStressTest):
+class EQSANSDarkCurrent(systemtesting.MantidSystemTest):
"""
Analysis Tests for EQSANS
Testing that the I(Q) output of is correct
diff --git a/Testing/SystemTests/tests/analysis/EQSANSEffAPIv2.py b/Testing/SystemTests/tests/analysis/EQSANSEffAPIv2.py
index ddd116c3eb8b5317650f69e25e55956a3453a570..6f4317b10a47a0666f11599e2ec111a25d03bd05 100644
--- a/Testing/SystemTests/tests/analysis/EQSANSEffAPIv2.py
+++ b/Testing/SystemTests/tests/analysis/EQSANSEffAPIv2.py
@@ -5,7 +5,7 @@
# & Institut Laue - Langevin
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init,attribute-defined-outside-init
-import stresstesting
+import systemtesting
from mantid.simpleapi import *
from reduction_workflow.instruments.sans.sns_command_interface import *
from reduction_workflow.instruments.sans.hfir_command_interface import SensitivityCorrection, SetTransmission
@@ -14,7 +14,7 @@ from mantid.api import FileFinder
import os
-class EQSANSEff(stresstesting.MantidStressTest):
+class EQSANSEff(systemtesting.MantidSystemTest):
def cleanup(self):
absfile = FileFinder.getFullPath("EQSANS_1466_event_reduction.log")
diff --git a/Testing/SystemTests/tests/analysis/EQSANSFlatTestAPIv2.py b/Testing/SystemTests/tests/analysis/EQSANSFlatTestAPIv2.py
index e13e4ee68eb2212c7610ab633f7aef3d7e2fceb7..d6ec6ed04fec8a37c7f315967d8464b6bc97001e 100644
--- a/Testing/SystemTests/tests/analysis/EQSANSFlatTestAPIv2.py
+++ b/Testing/SystemTests/tests/analysis/EQSANSFlatTestAPIv2.py
@@ -5,7 +5,7 @@
# & Institut Laue - Langevin
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init,attribute-defined-outside-init
-import stresstesting
+import systemtesting
from mantid.simpleapi import *
from reduction_workflow.instruments.sans.sns_command_interface import *
from reduction_workflow.instruments.sans.hfir_command_interface import *
@@ -13,7 +13,7 @@ from reduction_workflow.instruments.sans.hfir_command_interface import *
FILE_LOCATION = "/SNS/EQSANS/IPTS-5636/data/"
-class EQSANSFlatTest(stresstesting.MantidStressTest):
+class EQSANSFlatTest(systemtesting.MantidSystemTest):
def requiredFiles(self):
files = []
files.append(FILE_LOCATION+"EQSANS_5704_event.nxs")
diff --git a/Testing/SystemTests/tests/analysis/EQSANSIQOutputAPIv2.py b/Testing/SystemTests/tests/analysis/EQSANSIQOutputAPIv2.py
index 81622beeae9384642517ae0dc850fccd37b2fa8e..80c7df86a24d0a53596ceef828c7380ff5ceac1f 100644
--- a/Testing/SystemTests/tests/analysis/EQSANSIQOutputAPIv2.py
+++ b/Testing/SystemTests/tests/analysis/EQSANSIQOutputAPIv2.py
@@ -6,7 +6,7 @@
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init,invalid-name,attribute-defined-outside-init
from __future__ import (absolute_import, division, print_function)
-import stresstesting
+import systemtesting
import math
import os
from mantid.simpleapi import *
@@ -26,7 +26,7 @@ def do_cleanup():
return True
-class EQSANSIQOutput(stresstesting.MantidStressTest):
+class EQSANSIQOutput(systemtesting.MantidSystemTest):
"""
Analysis Tests for EQSANS
Testing that the I(Q) output of is correct
@@ -69,7 +69,7 @@ class EQSANSIQOutput(stresstesting.MantidStressTest):
return "EQSANS_1466_event_Iq", 'EQSANSIQOutput.nxs'
-class EQSANSBeamMonitor(stresstesting.MantidStressTest):
+class EQSANSBeamMonitor(systemtesting.MantidSystemTest):
"""
Analysis Tests for EQSANS
Testing that the I(Q) output of is correct
@@ -100,7 +100,7 @@ class EQSANSBeamMonitor(stresstesting.MantidStressTest):
return "EQSANS_1466_event_Iq", 'EQSANSBeamMonitor.nxs'
-class EQSANSDQPositiveOutput(stresstesting.MantidStressTest):
+class EQSANSDQPositiveOutput(systemtesting.MantidSystemTest):
"""
Analysis Tests for EQSANS
Testing that the Q resolution output of is correct
@@ -138,7 +138,7 @@ class EQSANSDQPositiveOutput(stresstesting.MantidStressTest):
return True
-class EQSANSDQOutput(stresstesting.MantidStressTest):
+class EQSANSDQOutput(systemtesting.MantidSystemTest):
"""
Analysis Tests for EQSANS
Testing that the Q resolution output of is correct
@@ -204,7 +204,7 @@ class EQSANSDQOutput(stresstesting.MantidStressTest):
return output
-class EQSANSDQOutput_FS(stresstesting.MantidStressTest):
+class EQSANSDQOutput_FS(systemtesting.MantidSystemTest):
"""
Analysis Tests for EQSANS
Testing that the Q resolution output of is correct
diff --git a/Testing/SystemTests/tests/analysis/EQSANSNormalisationAPIv2.py b/Testing/SystemTests/tests/analysis/EQSANSNormalisationAPIv2.py
index 7212fc1fd1d6347d7cdb1b828888706dd715f7fa..2d75b3423a85d565b90c714f8e70e5277bbc715c 100644
--- a/Testing/SystemTests/tests/analysis/EQSANSNormalisationAPIv2.py
+++ b/Testing/SystemTests/tests/analysis/EQSANSNormalisationAPIv2.py
@@ -5,14 +5,14 @@
# & Institut Laue - Langevin
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init,invalid-name
-import stresstesting
+import systemtesting
from mantid.simpleapi import *
from reduction_workflow.instruments.sans.sns_command_interface import *
from mantid.api import *
import os
-class EQSANSNormalisationNoFlux(stresstesting.MantidStressTest):
+class EQSANSNormalisationNoFlux(systemtesting.MantidSystemTest):
"""
Analysis Tests for EQSANS
Testing that the I(Q) output of is correct
@@ -41,7 +41,7 @@ class EQSANSNormalisationNoFlux(stresstesting.MantidStressTest):
return "eqsans_no_flux", 'EQSANSNormalisation_NoFlux.nxs'
-class EQSANSNormalisationDefault(stresstesting.MantidStressTest):
+class EQSANSNormalisationDefault(systemtesting.MantidSystemTest):
"""
Analysis Tests for EQSANS
Testing that the I(Q) output of is correct
@@ -78,7 +78,7 @@ class EQSANSNormalisationDefault(stresstesting.MantidStressTest):
return "eqsans_default_flux", 'EQSANSNormalisation_DefaultFlux.nxs'
-class EQSANSNormalisationInputFlux(stresstesting.MantidStressTest):
+class EQSANSNormalisationInputFlux(systemtesting.MantidSystemTest):
"""
Analysis Tests for EQSANS
Testing that the I(Q) output of is correct
@@ -109,7 +109,7 @@ class EQSANSNormalisationInputFlux(stresstesting.MantidStressTest):
return "eqsans_input_flux", 'EQSANSNormalisation_InputFlux.nxs'
-class EQSANSNormalisationBeamFlux(stresstesting.MantidStressTest):
+class EQSANSNormalisationBeamFlux(systemtesting.MantidSystemTest):
"""
Analysis Tests for EQSANS
"""
diff --git a/Testing/SystemTests/tests/analysis/EQSANSProcessedEffAPIv2.py b/Testing/SystemTests/tests/analysis/EQSANSProcessedEffAPIv2.py
index 9b1ea278b338e23423cd148d957e624b8edf4400..1b5ff363424d8e6a97ae17c8fbb9c4bd8eaa5b58 100644
--- a/Testing/SystemTests/tests/analysis/EQSANSProcessedEffAPIv2.py
+++ b/Testing/SystemTests/tests/analysis/EQSANSProcessedEffAPIv2.py
@@ -5,7 +5,7 @@
# & Institut Laue - Langevin
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init,attribute-defined-outside-init
-import stresstesting
+import systemtesting
from mantid.simpleapi import *
from reduction_workflow.instruments.sans.sns_command_interface import *
from reduction_workflow.instruments.sans.hfir_command_interface import SensitivityCorrection, SetTransmission
@@ -14,7 +14,7 @@ from mantid.api import FileFinder
import os
-class EQSANSProcessedEff(stresstesting.MantidStressTest):
+class EQSANSProcessedEff(systemtesting.MantidSystemTest):
def cleanup(self):
absfile = FileFinder.getFullPath("EQSANS_1466_event_reduction.log")
diff --git a/Testing/SystemTests/tests/analysis/EQSANSSolidAPIv2.py b/Testing/SystemTests/tests/analysis/EQSANSSolidAPIv2.py
index c28cc921e73876673006c3395711a76ddc9d73c4..ef6ee1b1e230b9228d2301d46cd61a7e783dd45f 100644
--- a/Testing/SystemTests/tests/analysis/EQSANSSolidAPIv2.py
+++ b/Testing/SystemTests/tests/analysis/EQSANSSolidAPIv2.py
@@ -6,7 +6,7 @@
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init,attribute-defined-outside-init
from __future__ import (absolute_import, division, print_function)
-import stresstesting
+import systemtesting
from mantid.simpleapi import *
from reduction_workflow.instruments.sans.sns_command_interface import *
from reduction_workflow.instruments.sans.hfir_command_interface import *
@@ -23,7 +23,7 @@ def do_cleanup():
return True
-class EQSANSSolid(stresstesting.MantidStressTest):
+class EQSANSSolid(systemtesting.MantidSystemTest):
"""
Analysis Tests for EQSANS
Testing that the I(Q) output of is correct
diff --git a/Testing/SystemTests/tests/analysis/EQSANSTransAPIv2.py b/Testing/SystemTests/tests/analysis/EQSANSTransAPIv2.py
index ac68690af2a65965e0a438ffe3be48605d4c2606..1cd510259eff69b0514e33a1ffe257aa8969fa48 100644
--- a/Testing/SystemTests/tests/analysis/EQSANSTransAPIv2.py
+++ b/Testing/SystemTests/tests/analysis/EQSANSTransAPIv2.py
@@ -5,7 +5,7 @@
# & Institut Laue - Langevin
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init,attribute-defined-outside-init
-import stresstesting
+import systemtesting
from mantid.simpleapi import *
from reduction_workflow.instruments.sans.sns_command_interface import *
from reduction_workflow.instruments.sans.hfir_command_interface import *
@@ -24,7 +24,7 @@ def do_cleanup():
return True
-class EQSANSTransmission(stresstesting.MantidStressTest):
+class EQSANSTransmission(systemtesting.MantidSystemTest):
def cleanup(self):
do_cleanup()
@@ -95,7 +95,7 @@ class EQSANSTransmissionEvent(EQSANSTransmission):
return "EQSANS_1466_event_Iq", 'EQSANSTransEvent.nxs'
-class EQSANSTransmissionDC(stresstesting.MantidStressTest):
+class EQSANSTransmissionDC(systemtesting.MantidSystemTest):
def cleanup(self):
do_cleanup()
@@ -174,7 +174,7 @@ class EQSANSTransmissionCompatibility(EQSANSTransmission):
return "EQSANS_1466_event_Iq", 'EQSANSTransmissionCompatibility.nxs'
-class EQSANSTransmissionFS(stresstesting.MantidStressTest):
+class EQSANSTransmissionFS(systemtesting.MantidSystemTest):
def cleanup(self):
do_cleanup()
@@ -207,7 +207,7 @@ class EQSANSTransmissionFS(stresstesting.MantidStressTest):
return "EQSANS_4061_event_frame1_Iq", 'EQSANSTransmissionFS.nxs'
-class EQSANSDirectTransFS(stresstesting.MantidStressTest):
+class EQSANSDirectTransFS(systemtesting.MantidSystemTest):
def cleanup(self):
do_cleanup()
diff --git a/Testing/SystemTests/tests/analysis/EllipsoidIntegr.py b/Testing/SystemTests/tests/analysis/EllipsoidIntegr.py
index f75b63f826721bb3a2e942c24dc8f71ea458293e..9d20a513d704b9e0d97fe0a2992877cb5f236d55 100644
--- a/Testing/SystemTests/tests/analysis/EllipsoidIntegr.py
+++ b/Testing/SystemTests/tests/analysis/EllipsoidIntegr.py
@@ -9,14 +9,14 @@
#
# Integrates a run using the ellipsoid technique
-import stresstesting
+import systemtesting
from mantid.api import *
#sys.path.append("/home/ruth/GIT_MantidBuild/bin/")
from mantid.simpleapi import *
-class EllipsoidIntegr( stresstesting.MantidStressTest):
+class EllipsoidIntegr(systemtesting.MantidSystemTest):
def requiredMemoryMB(self):
""" Require about 12GB free """
diff --git a/Testing/SystemTests/tests/analysis/EnggCalibrationTest.py b/Testing/SystemTests/tests/analysis/EnggCalibrationTest.py
index 257ce38272889e1b1764dcb462492615df8f4e88..4261807b4885432fc60f38be70f8060663cecbbe 100644
--- a/Testing/SystemTests/tests/analysis/EnggCalibrationTest.py
+++ b/Testing/SystemTests/tests/analysis/EnggCalibrationTest.py
@@ -5,7 +5,7 @@
# & Institut Laue - Langevin
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=no-init
-import stresstesting
+import systemtesting
from mantid.simpleapi import *
from six import PY2
@@ -32,9 +32,9 @@ def rel_err_less_delta(val, ref, epsilon):
return check
-class EnginXFocusWithVanadiumCorrection(stresstesting.MantidStressTest):
+class EnginXFocusWithVanadiumCorrection(systemtesting.MantidSystemTest):
def __init__(self):
- stresstesting.MantidStressTest.__init__(self)
+ systemtesting.MantidSystemTest.__init__(self)
# This test makes sure that the pre-calculated values (which are extensively used in the
# unit tests) are still the same results as we get from the actual calculations
@@ -152,10 +152,10 @@ class EnginXFocusWithVanadiumCorrection(stresstesting.MantidStressTest):
mtd.remove(self.van_bank_curves_name)
-class EnginXCalibrateFullThenCalibrateTest(stresstesting.MantidStressTest):
+class EnginXCalibrateFullThenCalibrateTest(systemtesting.MantidSystemTest):
# pylint: disable=too-many-instance-attributes
def __init__(self):
- stresstesting.MantidStressTest.__init__(self)
+ systemtesting.MantidSystemTest.__init__(self)
# difc and zero parameters for GSAS
self.difa = -1
self.difa_b2 = -1
diff --git a/Testing/SystemTests/tests/analysis/ErrorReporterServerTest.py b/Testing/SystemTests/tests/analysis/ErrorReporterServerTest.py
index 593d05b71b2772d1456ed365aa88891fff514964..fd54cd1b95f3a993b0e1026a56488d4d7726e097 100644
--- a/Testing/SystemTests/tests/analysis/ErrorReporterServerTest.py
+++ b/Testing/SystemTests/tests/analysis/ErrorReporterServerTest.py
@@ -6,7 +6,7 @@
# SPDX - License - Identifier: GPL - 3.0 +
import sys
-import stresstesting
+import systemtesting
from ErrorReporter.error_report_presenter import ErrorReporterPresenter # noqa
if sys.version_info.major < 3:
@@ -15,7 +15,7 @@ else:
from unittest import mock
-class ErrorReportServerTests(stresstesting.MantidStressTest):
+class ErrorReportServerTests(systemtesting.MantidSystemTest):
def setUp(self):
mock_view = mock.MagicMock()
self.error_report_presenter = ErrorReporterPresenter(mock_view, '1')
diff --git a/Testing/SystemTests/tests/analysis/FilteredLoadvsLoadThenFilter.py b/Testing/SystemTests/tests/analysis/FilteredLoadvsLoadThenFilter.py
index 9e4150009621269e2d1f7295a23d4625379b30ac..0bbce6068236a97089c2e853adb7661c1fdad468 100644
--- a/Testing/SystemTests/tests/analysis/FilteredLoadvsLoadThenFilter.py
+++ b/Testing/SystemTests/tests/analysis/FilteredLoadvsLoadThenFilter.py
@@ -5,11 +5,11 @@
# & Institut Laue - Langevin
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init
-import stresstesting
+import systemtesting
from mantid.simpleapi import *
-class FilteredLoadvsLoadThenFilter(stresstesting.MantidStressTest):
+class FilteredLoadvsLoadThenFilter(systemtesting.MantidSystemTest):
'''Tests that filtering with LoadEventNexus gives the same answer as loading the whole file and then filtering'''
def runTest(self):
diff --git a/Testing/SystemTests/tests/analysis/FindSatellitePeaksTest.py b/Testing/SystemTests/tests/analysis/FindSatellitePeaksTest.py
index 829903fae0e938df5559296f418eb06bf8b0ab58..b1a0b72d83835121feff86b7a99c013b32d1f06a 100644
--- a/Testing/SystemTests/tests/analysis/FindSatellitePeaksTest.py
+++ b/Testing/SystemTests/tests/analysis/FindSatellitePeaksTest.py
@@ -6,7 +6,7 @@
# SPDX - License - Identifier: GPL - 3.0 +
from mantid.simpleapi import FindSatellitePeaks, Load
import unittest
-import stresstesting
+import systemtesting
def load_files():
@@ -19,7 +19,7 @@ def load_files():
return md_workspace, main_peaks, satellite_peaks
-class FindSatellitePeaksTestFixedNumQ(stresstesting.MantidStressTest):
+class FindSatellitePeaksTestFixedNumQ(systemtesting.MantidSystemTest):
def requiredFiles(self):
return ["WISH_md_small.nxs", "WISH_peak_hkl_small.nxs", "WISH_peak_hkl_frac_small.nxs"]
@@ -43,7 +43,7 @@ class FindSatellitePeaksTestFixedNumQ(stresstesting.MantidStressTest):
return self._satellites_refined.name(), 'refine_satellites_fixed_q_test.nxs'
-class FindSatellitePeaksTestAutoFindQ(stresstesting.MantidStressTest):
+class FindSatellitePeaksTestAutoFindQ(systemtesting.MantidSystemTest):
def requiredFiles(self):
return ["WISH_md_small.nxs", "WISH_peak_hkl_small.nxs", "WISH_peak_hkl_frac_small.nxs"]
diff --git a/Testing/SystemTests/tests/analysis/FlatPlatePaalmanPingsCorrectionTest.py b/Testing/SystemTests/tests/analysis/FlatPlatePaalmanPingsCorrectionTest.py
index a5e81c9b4f29137a81ed6d065d61ae9854b50774..814eaf68e4e07b10c3b6745f9620453895a9ada4 100644
--- a/Testing/SystemTests/tests/analysis/FlatPlatePaalmanPingsCorrectionTest.py
+++ b/Testing/SystemTests/tests/analysis/FlatPlatePaalmanPingsCorrectionTest.py
@@ -4,11 +4,11 @@
# NScD Oak Ridge National Laboratory, European Spallation Source
# & Institut Laue - Langevin
# SPDX - License - Identifier: GPL - 3.0 +
-import stresstesting
+import systemtesting
from mantid.simpleapi import *
-class FlatPlatePaalmanPingsCorrectionTest(stresstesting.MantidStressTest):
+class FlatPlatePaalmanPingsCorrectionTest(systemtesting.MantidSystemTest):
def create_input_workspace(self, ws):
# ws = ws with first two channels set to 2.602 AA and last two channels to 31.974AA
LoadNexus(Filename='IN16B_felo_002K.nxs', OutputWorkspace=ws)
diff --git a/Testing/SystemTests/tests/analysis/GEMTests.py b/Testing/SystemTests/tests/analysis/GEMTests.py
index 6c2184ac1dd9fb2c53669f5bdb33f9b9fd008e40..ce0907f0235f969a717640311967cb26aee684e7 100644
--- a/Testing/SystemTests/tests/analysis/GEMTests.py
+++ b/Testing/SystemTests/tests/analysis/GEMTests.py
@@ -4,17 +4,17 @@
# NScD Oak Ridge National Laboratory, European Spallation Source
# & Institut Laue - Langevin
# SPDX - License - Identifier: GPL - 3.0 +
-import stresstesting
+import systemtesting
import os
from mantid.simpleapi import *
#pylint: disable=too-many-instance-attributes
-class GEMTest(stresstesting.MantidStressTest):
+class GEMTest(systemtesting.MantidSystemTest):
validate=None
def __init__(self):
- stresstesting.MantidStressTest.__init__(self)
+ systemtesting.MantidSystemTest.__init__(self)
self.gss_file = ''
self.ref_gss_file = 'GEM58654.gss'
self.xye_tof_files = []
diff --git a/Testing/SystemTests/tests/analysis/GSASIIRefineFitPeaksTest.py b/Testing/SystemTests/tests/analysis/GSASIIRefineFitPeaksTest.py
index 517236a67f308fb05595be13546aafbcaa763452..22fdd14d2ff5c6e873b683915c6d992b2c84f1c1 100644
--- a/Testing/SystemTests/tests/analysis/GSASIIRefineFitPeaksTest.py
+++ b/Testing/SystemTests/tests/analysis/GSASIIRefineFitPeaksTest.py
@@ -10,12 +10,12 @@ import os
import re
import mantid
import site
-import stresstesting
+import systemtesting
import tempfile
from mantid.simpleapi import GSASIIRefineFitPeaks, Load
-class _AbstractGSASIIRefineFitPeaksTest(stresstesting.MantidStressTest):
+class _AbstractGSASIIRefineFitPeaksTest(systemtesting.MantidSystemTest):
__metaclass__ = ABCMeta
diff --git a/Testing/SystemTests/tests/analysis/GetQsInQENSDataSystemTest.py b/Testing/SystemTests/tests/analysis/GetQsInQENSDataSystemTest.py
index 3ed576d7509f0f45275d2cbd86b956b38c35dcf2..a9c4b5583c7b5753ff90a0da338970da71122633 100644
--- a/Testing/SystemTests/tests/analysis/GetQsInQENSDataSystemTest.py
+++ b/Testing/SystemTests/tests/analysis/GetQsInQENSDataSystemTest.py
@@ -8,12 +8,12 @@
"""
Extract or compute the Q values from reduced QENS data
"""
-from stresstesting import MantidStressTest
+from systemtesting import MantidSystemTest
import mantid.simpleapi as sm
import hashlib
-class GetQsInQENSDataSystemTest(MantidStressTest):
+class GetQsInQENSDataSystemTest(MantidSystemTest):
"""Example:
if qvalues = [0.3, 0.5, 0.7, 0.9] for a particular file, then
input_string = ' '.join(['{0:6.3f}'.format(Q) for Q in qvalues ])
diff --git a/Testing/SystemTests/tests/analysis/HFIRBackgroundAPIv2.py b/Testing/SystemTests/tests/analysis/HFIRBackgroundAPIv2.py
index 8f7ee9f39d130fa5e2a71670b9e5fe290d09b72a..0b24e7991df507ac8ff454a2181a619b8388f169 100644
--- a/Testing/SystemTests/tests/analysis/HFIRBackgroundAPIv2.py
+++ b/Testing/SystemTests/tests/analysis/HFIRBackgroundAPIv2.py
@@ -5,7 +5,7 @@
# & Institut Laue - Langevin
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init,attribute-defined-outside-init
-import stresstesting
+import systemtesting
from mantid.api import FileFinder
from mantid.simpleapi import *
from reduction_workflow.instruments.sans.hfir_command_interface import *
@@ -26,7 +26,7 @@ def do_cleanup():
return True
-class HFIRBackground(stresstesting.MantidStressTest):
+class HFIRBackground(systemtesting.MantidSystemTest):
def cleanup(self):
do_cleanup()
@@ -52,7 +52,7 @@ class HFIRBackground(stresstesting.MantidStressTest):
return "BioSANS_test_data_Iq", 'HFIRBackground.nxs'
-class HFIRBackgroundTransmission(stresstesting.MantidStressTest):
+class HFIRBackgroundTransmission(systemtesting.MantidSystemTest):
def cleanup(self):
do_cleanup()
@@ -78,7 +78,7 @@ class HFIRBackgroundTransmission(stresstesting.MantidStressTest):
return "BioSANS_test_data_Iq", 'HFIRBackgroundTransmission.nxs'
-class HFIRBackgroundDirectBeamTrans(stresstesting.MantidStressTest):
+class HFIRBackgroundDirectBeamTrans(systemtesting.MantidSystemTest):
def cleanup(self):
do_cleanup()
@@ -106,7 +106,7 @@ class HFIRBackgroundDirectBeamTrans(stresstesting.MantidStressTest):
return "BioSANS_test_data_Iq", 'HFIRBackgroundDirectBeamTrans.nxs'
-class HFIRBackgroundBeamSpreaderTrans(stresstesting.MantidStressTest):
+class HFIRBackgroundBeamSpreaderTrans(systemtesting.MantidSystemTest):
def cleanup(self):
do_cleanup()
@@ -137,7 +137,7 @@ class HFIRBackgroundBeamSpreaderTrans(stresstesting.MantidStressTest):
return "BioSANS_test_data_Iq", 'HFIRBackgroundBeamSpreaderTrans.nxs'
-class HFIRBackgroundTransDarkCurrent(stresstesting.MantidStressTest):
+class HFIRBackgroundTransDarkCurrent(systemtesting.MantidSystemTest):
def cleanup(self):
do_cleanup()
@@ -166,7 +166,7 @@ class HFIRBackgroundTransDarkCurrent(stresstesting.MantidStressTest):
return "BioSANS_test_data_Iq", 'HFIRBackgroundTransDarkCurrent.nxs'
-class HFIRBackgroundDirectBeamTransDC(stresstesting.MantidStressTest):
+class HFIRBackgroundDirectBeamTransDC(systemtesting.MantidSystemTest):
def cleanup(self):
do_cleanup()
diff --git a/Testing/SystemTests/tests/analysis/HFIREffAPIv2.py b/Testing/SystemTests/tests/analysis/HFIREffAPIv2.py
index b27c731efeb017f6850024096e667c397239a66e..9571cbc9d046e02350991ad848189a8461645bd1 100644
--- a/Testing/SystemTests/tests/analysis/HFIREffAPIv2.py
+++ b/Testing/SystemTests/tests/analysis/HFIREffAPIv2.py
@@ -5,7 +5,7 @@
# & Institut Laue - Langevin
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init,attribute-defined-outside-init
-import stresstesting
+import systemtesting
from mantid.api import FileFinder
from mantid.simpleapi import *
from reduction_workflow.instruments.sans.hfir_command_interface import *
@@ -26,7 +26,7 @@ def do_cleanup():
return True
-class HFIREffAPIv2(stresstesting.MantidStressTest):
+class HFIREffAPIv2(systemtesting.MantidSystemTest):
def cleanup(self):
do_cleanup()
@@ -56,7 +56,7 @@ class HFIREffAPIv2(stresstesting.MantidStressTest):
return "BioSANS_test_data_Iq", 'HFIREff.nxs'
-class HFIRSensitivityDirectBeamCenter(stresstesting.MantidStressTest):
+class HFIRSensitivityDirectBeamCenter(systemtesting.MantidSystemTest):
def cleanup(self):
do_cleanup()
@@ -88,7 +88,7 @@ class HFIRSensitivityDirectBeamCenter(stresstesting.MantidStressTest):
return "BioSANS_test_data_Iq", 'HFIRSensitivityDirectBeamCenter.nxs'
-class HFIRSensitivityScatteringBeamCenter(stresstesting.MantidStressTest):
+class HFIRSensitivityScatteringBeamCenter(systemtesting.MantidSystemTest):
def cleanup(self):
do_cleanup()
diff --git a/Testing/SystemTests/tests/analysis/HFIRReductionAPIv2.py b/Testing/SystemTests/tests/analysis/HFIRReductionAPIv2.py
index 852c0f389e48e1b23e2b490e7636c3f16c915286..6227f112d87e5c6c14a04d035e827905b806c31a 100644
--- a/Testing/SystemTests/tests/analysis/HFIRReductionAPIv2.py
+++ b/Testing/SystemTests/tests/analysis/HFIRReductionAPIv2.py
@@ -5,7 +5,7 @@
# & Institut Laue - Langevin
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init,attribute-defined-outside-init
-import stresstesting
+import systemtesting
from mantid.api import FileFinder
from mantid.simpleapi import *
from reduction_workflow.instruments.sans.hfir_command_interface import *
@@ -26,7 +26,7 @@ def do_cleanup():
return True
-class HFIRReductionAPIv2(stresstesting.MantidStressTest):
+class HFIRReductionAPIv2(systemtesting.MantidSystemTest):
"""
Simple reduction example
"""
@@ -56,7 +56,7 @@ class HFIRReductionAPIv2(stresstesting.MantidStressTest):
return "BioSANS_test_data_Iq", "HFIRReduction.nxs"
-class HFIRAbsoluteScalingReference(stresstesting.MantidStressTest):
+class HFIRAbsoluteScalingReference(systemtesting.MantidSystemTest):
"""
Test absolute scaling using a reference data set
"""
@@ -87,7 +87,7 @@ class HFIRAbsoluteScalingReference(stresstesting.MantidStressTest):
return "BioSANS_test_data_Iq", "HFIRAbsoluteScalingReference.nxs"
-class HFIRAbsoluteScalingValue(stresstesting.MantidStressTest):
+class HFIRAbsoluteScalingValue(systemtesting.MantidSystemTest):
"""
Test absolute scaling using a reference data set
"""
diff --git a/Testing/SystemTests/tests/analysis/HFIRTestsAPIv2.py b/Testing/SystemTests/tests/analysis/HFIRTestsAPIv2.py
index 3b1f93f728e34f2417e2b7ef996f1ba04540074a..60d8a67f96cb467bd61df3d2df335a877315a1a9 100644
--- a/Testing/SystemTests/tests/analysis/HFIRTestsAPIv2.py
+++ b/Testing/SystemTests/tests/analysis/HFIRTestsAPIv2.py
@@ -11,7 +11,7 @@
System tests for HFIR SANS reduction.
The following tests were converted from the unittest framework
- that is part of python to the stresstesting framework used in Mantid.
+ that is part of python to the systemtesting framework used in Mantid.
"""
from __future__ import (absolute_import, division, print_function)
import types
@@ -20,7 +20,7 @@ import traceback
import math
import os
-import stresstesting
+import systemtesting
from mantid.api import *
from mantid.simpleapi import *
from reduction_workflow.instruments.sans.hfir_command_interface import *
@@ -151,7 +151,7 @@ def do_cleanup():
return True
-class HFIRTestsAPIv2(stresstesting.MantidStressTest):
+class HFIRTestsAPIv2(systemtesting.MantidSystemTest):
def cleanup(self):
do_cleanup()
diff --git a/Testing/SystemTests/tests/analysis/HFIRTransAPIv2.py b/Testing/SystemTests/tests/analysis/HFIRTransAPIv2.py
index 15e2407bcaa7b5151d6ddd1ae6cb2ba0f8676c1a..2ef4b702eedd8231183181255d096fb112983132 100644
--- a/Testing/SystemTests/tests/analysis/HFIRTransAPIv2.py
+++ b/Testing/SystemTests/tests/analysis/HFIRTransAPIv2.py
@@ -5,7 +5,7 @@
# & Institut Laue - Langevin
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init,attribute-defined-outside-init
-import stresstesting
+import systemtesting
from mantid.api import FileFinder
from mantid.simpleapi import *
from reduction_workflow.instruments.sans.hfir_command_interface import *
@@ -26,7 +26,7 @@ def do_cleanup():
return True
-class HFIRTrans1(stresstesting.MantidStressTest):
+class HFIRTrans1(systemtesting.MantidSystemTest):
def cleanup(self):
do_cleanup()
@@ -54,7 +54,7 @@ class HFIRTrans1(stresstesting.MantidStressTest):
return "BioSANS_test_data_Iq", 'HFIRTrans.nxs'
-class HFIRTrans2(stresstesting.MantidStressTest):
+class HFIRTrans2(systemtesting.MantidSystemTest):
def cleanup(self):
do_cleanup()
@@ -81,7 +81,7 @@ class HFIRTrans2(stresstesting.MantidStressTest):
return "BioSANS_test_data_Iq", 'HFIRTrans.nxs'
-class HFIRTransmissionDarkCurrent(stresstesting.MantidStressTest):
+class HFIRTransmissionDarkCurrent(systemtesting.MantidSystemTest):
def cleanup(self):
do_cleanup()
@@ -110,7 +110,7 @@ class HFIRTransmissionDarkCurrent(stresstesting.MantidStressTest):
return "BioSANS_test_data_Iq", 'HFIRTransmissionDarkCurrent.nxs'
-class HFIRTransmissionDirectBeamCenter(stresstesting.MantidStressTest):
+class HFIRTransmissionDirectBeamCenter(systemtesting.MantidSystemTest):
def cleanup(self):
do_cleanup()
@@ -139,7 +139,7 @@ class HFIRTransmissionDirectBeamCenter(stresstesting.MantidStressTest):
return "BioSANS_test_data_Iq", 'HFIRTransmissionDirectBeamCenter.nxs'
-class HFIRTransmissionBeamCenter(stresstesting.MantidStressTest):
+class HFIRTransmissionBeamCenter(systemtesting.MantidSystemTest):
def cleanup(self):
do_cleanup()
@@ -169,7 +169,7 @@ class HFIRTransmissionBeamCenter(stresstesting.MantidStressTest):
return "BioSANS_test_data_Iq", 'HFIRTransmissionDirectBeamCenter.nxs'
-class HFIRTransmissionBeamSpreader(stresstesting.MantidStressTest):
+class HFIRTransmissionBeamSpreader(systemtesting.MantidSystemTest):
def cleanup(self):
do_cleanup()
@@ -201,7 +201,7 @@ class HFIRTransmissionBeamSpreader(stresstesting.MantidStressTest):
return "BioSANS_test_data_Iq", 'HFIRTransmissionBeamSpreader.nxs'
-class HFIRTransmissionBeamSpreaderDC(stresstesting.MantidStressTest):
+class HFIRTransmissionBeamSpreaderDC(systemtesting.MantidSystemTest):
def cleanup(self):
do_cleanup()
@@ -234,7 +234,7 @@ class HFIRTransmissionBeamSpreaderDC(stresstesting.MantidStressTest):
return "BioSANS_test_data_Iq", 'HFIRTransmissionBeamSpreaderDC.nxs'
-class HFIRTransmissionBeamSpreaderDBC(stresstesting.MantidStressTest):
+class HFIRTransmissionBeamSpreaderDBC(systemtesting.MantidSystemTest):
def cleanup(self):
do_cleanup()
@@ -267,7 +267,7 @@ class HFIRTransmissionBeamSpreaderDBC(stresstesting.MantidStressTest):
return "BioSANS_test_data_Iq", 'HFIRTransmissionBeamSpreaderDBC.nxs'
-class HFIRTransmissionBeamSpreaderBC(stresstesting.MantidStressTest):
+class HFIRTransmissionBeamSpreaderBC(systemtesting.MantidSystemTest):
def cleanup(self):
do_cleanup()
diff --git a/Testing/SystemTests/tests/analysis/HRPDPowderDiffraction.py b/Testing/SystemTests/tests/analysis/HRPDPowderDiffraction.py
index 900edacfe5c2b1ea9727237ffa5d308042a497d6..d5b5d77a20becf6cbd3631f8d1be78d34a9b4355 100644
--- a/Testing/SystemTests/tests/analysis/HRPDPowderDiffraction.py
+++ b/Testing/SystemTests/tests/analysis/HRPDPowderDiffraction.py
@@ -5,13 +5,13 @@
# & Institut Laue - Langevin
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init
-import stresstesting
+import systemtesting
from mantid.simpleapi import *
# Simply tests that our LoadRaw and LoadISISNexus algorithms produce the same workspace
-class HRPDPowderDiffraction(stresstesting.MantidStressTest):
+class HRPDPowderDiffraction(systemtesting.MantidSystemTest):
def requiredFiles(self):
return ["HRP39191.RAW", "hrpd_new_072_01_corr.cal", "HRP39187.RAW", 'HRPDPowderDiffraction.nxs']
diff --git a/Testing/SystemTests/tests/analysis/HYSPECReductionTest.py b/Testing/SystemTests/tests/analysis/HYSPECReductionTest.py
index d7af4486e5ae711f2185a5386fa1c18c52ed2edd..e051dd1ab48b841d77d2a345f02d41c115dff426 100644
--- a/Testing/SystemTests/tests/analysis/HYSPECReductionTest.py
+++ b/Testing/SystemTests/tests/analysis/HYSPECReductionTest.py
@@ -11,10 +11,10 @@ System test for HYSPEC reduction
from mantid.simpleapi import *
import os
-import stresstesting
+import systemtesting
-class HYSPECReductionTest(stresstesting.MantidStressTest):
+class HYSPECReductionTest(systemtesting.MantidSystemTest):
groupingFile = ''
tolerance=1e-8
diff --git a/Testing/SystemTests/tests/analysis/ILLD33Test.py b/Testing/SystemTests/tests/analysis/ILLD33Test.py
index bdeabba1ac1db60faeb3cfd84d137009d8e2fa68..61ad85c60f7babe5b09de8ebe8c540647afcb51c 100644
--- a/Testing/SystemTests/tests/analysis/ILLD33Test.py
+++ b/Testing/SystemTests/tests/analysis/ILLD33Test.py
@@ -5,7 +5,7 @@
# & Institut Laue - Langevin
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init
-import stresstesting
+import systemtesting
from mantid.api import mtd
import mantid.simpleapi as ms
@@ -96,7 +96,7 @@ class ILLD33SANSTest(unittest.TestCase):
#====================================================================================
-class ILLD33Test(stresstesting.MantidStressTest):
+class ILLD33Test(systemtesting.MantidSystemTest):
_success = False
def requiredMemoryMB(self):
diff --git a/Testing/SystemTests/tests/analysis/ILLIN4Test.py b/Testing/SystemTests/tests/analysis/ILLIN4Test.py
index 9d88500b7d92c1a83f892a8894cd48307db993ab..89a18d2f85c6eb835dea871f9fe163a46fed203e 100644
--- a/Testing/SystemTests/tests/analysis/ILLIN4Test.py
+++ b/Testing/SystemTests/tests/analysis/ILLIN4Test.py
@@ -5,7 +5,7 @@
# & Institut Laue - Langevin
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init
-import stresstesting
+import systemtesting
from mantid.api import MatrixWorkspace, mtd
import mantid.simpleapi as ms
@@ -64,7 +64,7 @@ class ILLIN4Tests(unittest.TestCase):
#====================================================================================
-class LoadILLIN4Test(stresstesting.MantidStressTest):
+class LoadILLIN4Test(systemtesting.MantidSystemTest):
_success = False
diff --git a/Testing/SystemTests/tests/analysis/ILLIN5Test.py b/Testing/SystemTests/tests/analysis/ILLIN5Test.py
index 361a111256bce7e0d48eae9b9fb7cf63bbe650f6..d45323dc3d89ccd2f9bb2e3f7847a52a310120ee 100644
--- a/Testing/SystemTests/tests/analysis/ILLIN5Test.py
+++ b/Testing/SystemTests/tests/analysis/ILLIN5Test.py
@@ -5,7 +5,7 @@
# & Institut Laue - Langevin
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=invalid-name,no-init
-import stresstesting
+import systemtesting
from mantid.api import MatrixWorkspace, mtd
from mantid.simpleapi import *
@@ -77,7 +77,7 @@ class ILLIN5Tests(unittest.TestCase):
#====================================================================================
-class LoadILLIN5Test(stresstesting.MantidStressTest):
+class LoadILLIN5Test(systemtesting.MantidSystemTest):
_success=False
def runTest(self):
diff --git a/Testing/SystemTests/tests/analysis/ILLIndirectReductionFWS.py b/Testing/SystemTests/tests/analysis/ILLIndirectReductionFWS.py
index 6cf07084a88cb6f197e38f9b6860db1b30a153aa..28ef62ad614ca405cbfd79c4e3c9faa141baeeda 100644
--- a/Testing/SystemTests/tests/analysis/ILLIndirectReductionFWS.py
+++ b/Testing/SystemTests/tests/analysis/ILLIndirectReductionFWS.py
@@ -4,13 +4,13 @@
# NScD Oak Ridge National Laboratory, European Spallation Source
# & Institut Laue - Langevin
# SPDX - License - Identifier: GPL - 3.0 +
-import stresstesting
+import systemtesting
from mantid.simpleapi import CompareWorkspaces, LoadNexusProcessed, IndirectILLReductionFWS
from mantid import config, mtd
import numpy
-class ILLIndirectReductionFWSTest(stresstesting.MantidStressTest):
+class ILLIndirectReductionFWSTest(systemtesting.MantidSystemTest):
# cache default instrument and datadirs
facility = config['default.facility']
diff --git a/Testing/SystemTests/tests/analysis/ILLIndirectReductionQENS.py b/Testing/SystemTests/tests/analysis/ILLIndirectReductionQENS.py
index 4e8dd076519b78d3fb65c4cc5c84d2f46ce43697..495714c9db48647442a9ec562a2083dea916d581 100644
--- a/Testing/SystemTests/tests/analysis/ILLIndirectReductionQENS.py
+++ b/Testing/SystemTests/tests/analysis/ILLIndirectReductionQENS.py
@@ -4,12 +4,12 @@
# NScD Oak Ridge National Laboratory, European Spallation Source
# & Institut Laue - Langevin
# SPDX - License - Identifier: GPL - 3.0 +
-import stresstesting
+import systemtesting
from mantid.simpleapi import IndirectILLReductionQENS, Plus, CompareWorkspaces, GroupWorkspaces, Scale
from mantid import config, mtd
-class ILLIndirectReductionQENSTest(stresstesting.MantidStressTest):
+class ILLIndirectReductionQENSTest(systemtesting.MantidSystemTest):
# cache default instrument and datadirs
facility = config['default.facility']
diff --git a/Testing/SystemTests/tests/analysis/ILLPowderDiffDetEffCorrClosureTest.py b/Testing/SystemTests/tests/analysis/ILLPowderDiffDetEffCorrClosureTest.py
index 4eb05d8c560da61b131f954c0f8c903e8e67b2a7..06aeef019e93ea81457f9ca0f4aa6f258f861886 100644
--- a/Testing/SystemTests/tests/analysis/ILLPowderDiffDetEffCorrClosureTest.py
+++ b/Testing/SystemTests/tests/analysis/ILLPowderDiffDetEffCorrClosureTest.py
@@ -8,12 +8,12 @@ from __future__ import (absolute_import, division, print_function)
from tempfile import gettempdir
from os import path, remove
-import stresstesting
+import systemtesting
from mantid.simpleapi import PowderDiffILLDetEffCorr, SaveNexusProcessed
from mantid import config, mtd
-class ILLPowderDiffDetEffCorrClosureTest(stresstesting.MantidStressTest):
+class ILLPowderDiffDetEffCorrClosureTest(systemtesting.MantidSystemTest):
_m_tmp_file = None
diff --git a/Testing/SystemTests/tests/analysis/ILLPowderDiffDetEffCorrTest.py b/Testing/SystemTests/tests/analysis/ILLPowderDiffDetEffCorrTest.py
index 934aa6dfe52f18d91573055c3ca6d6d3eb8b3447..582a66026d939e495505e248458653853e4da6c7 100644
--- a/Testing/SystemTests/tests/analysis/ILLPowderDiffDetEffCorrTest.py
+++ b/Testing/SystemTests/tests/analysis/ILLPowderDiffDetEffCorrTest.py
@@ -6,12 +6,12 @@
# SPDX - License - Identifier: GPL - 3.0 +
from __future__ import (absolute_import, division, print_function)
-import stresstesting
+import systemtesting
from mantid.simpleapi import PowderDiffILLDetEffCorr, GroupWorkspaces
from mantid import config, mtd
-class ILLPowderDiffDetEffCorrTest(stresstesting.MantidStressTest):
+class ILLPowderDiffDetEffCorrTest(systemtesting.MantidSystemTest):
def __init__(self):
super(ILLPowderDiffDetEffCorrTest, self).__init__()
diff --git a/Testing/SystemTests/tests/analysis/ILLPowderDiffDetScanReductionTest.py b/Testing/SystemTests/tests/analysis/ILLPowderDiffDetScanReductionTest.py
index aefe86048e963547e3ded69c86d06a310dd49f4d..a67da151049b8145dcb790393e04f29d7201ece3 100644
--- a/Testing/SystemTests/tests/analysis/ILLPowderDiffDetScanReductionTest.py
+++ b/Testing/SystemTests/tests/analysis/ILLPowderDiffDetScanReductionTest.py
@@ -6,13 +6,13 @@
# SPDX - License - Identifier: GPL - 3.0 +
from __future__ import (absolute_import, division, print_function)
-import stresstesting
+import systemtesting
from mantid.simpleapi import *
# A dummy test class to subclass from.
# Sets up the facility and data search directories.
-class _DiffReductionTest(stresstesting.MantidStressTest):
+class _DiffReductionTest(systemtesting.MantidSystemTest):
_facility = ''
_directories = ''
diff --git a/Testing/SystemTests/tests/analysis/ILLPowderDiffReductionTest.py b/Testing/SystemTests/tests/analysis/ILLPowderDiffReductionTest.py
index 63e07dce36022c0acebb0692969764db9fe938e5..15845696672bd8453bdbe1cc48d65666114c6589 100644
--- a/Testing/SystemTests/tests/analysis/ILLPowderDiffReductionTest.py
+++ b/Testing/SystemTests/tests/analysis/ILLPowderDiffReductionTest.py
@@ -6,12 +6,12 @@
# SPDX - License - Identifier: GPL - 3.0 +
from __future__ import (absolute_import, division, print_function)
-import stresstesting
+import systemtesting
from mantid.simpleapi import PowderDiffILLReduction
from mantid import config, mtd
-class ILLPowderDiffReductionTest(stresstesting.MantidStressTest):
+class ILLPowderDiffReductionTest(systemtesting.MantidSystemTest):
def __init__(self):
super(ILLPowderDiffReductionTest, self).__init__()
diff --git a/Testing/SystemTests/tests/analysis/ILLPowderLoadDetectorScanTest.py b/Testing/SystemTests/tests/analysis/ILLPowderLoadDetectorScanTest.py
index afe60e1468c733e066114ca140784b0ae47467ba..3e91ca54491194f01332555978616a954f6fe19a 100644
--- a/Testing/SystemTests/tests/analysis/ILLPowderLoadDetectorScanTest.py
+++ b/Testing/SystemTests/tests/analysis/ILLPowderLoadDetectorScanTest.py
@@ -4,7 +4,7 @@
# NScD Oak Ridge National Laboratory, European Spallation Source
# & Institut Laue - Langevin
# SPDX - License - Identifier: GPL - 3.0 +
-import stresstesting
+import systemtesting
from mantid.simpleapi import LoadILLDiffraction
from mantid import config
@@ -12,7 +12,7 @@ from mantid import config
# TODO: Once the nexus saver for a scanned workspace is implemented,
# replace the assertions with compare workspaces with the reference
-class ILLPowderLoadDetectorScanTest(stresstesting.MantidStressTest):
+class ILLPowderLoadDetectorScanTest(systemtesting.MantidSystemTest):
def __init__(self):
super(ILLPowderLoadDetectorScanTest, self).__init__()
diff --git a/Testing/SystemTests/tests/analysis/ILL_D2B_DetEffCorrTest.py b/Testing/SystemTests/tests/analysis/ILL_D2B_DetEffCorrTest.py
index 8f31368d7368c80e3886d90284cb8b8c1c3cfe6e..072719d169dc6a2a7d90a9eb4234cad5b54c1096 100644
--- a/Testing/SystemTests/tests/analysis/ILL_D2B_DetEffCorrTest.py
+++ b/Testing/SystemTests/tests/analysis/ILL_D2B_DetEffCorrTest.py
@@ -6,13 +6,13 @@
# SPDX - License - Identifier: GPL - 3.0 +
from __future__ import (absolute_import, division, print_function)
-import stresstesting
+import systemtesting
from mantid.simpleapi import PowderDiffILLDetEffCorr, GroupWorkspaces
from mantid import config, mtd
import numpy as np
-class ILL_D2B_DetEffCorrTest(stresstesting.MantidStressTest):
+class ILL_D2B_DetEffCorrTest(systemtesting.MantidSystemTest):
def __init__(self):
super(ILL_D2B_DetEffCorrTest, self).__init__()
diff --git a/Testing/SystemTests/tests/analysis/ISISDirectInelastic.py b/Testing/SystemTests/tests/analysis/ISISDirectInelastic.py
index 9d97bb110655a4fd687902c835f35189f1fd00af..449d16f6e4b070a24db073a8f48fe09d7e627969 100644
--- a/Testing/SystemTests/tests/analysis/ISISDirectInelastic.py
+++ b/Testing/SystemTests/tests/analysis/ISISDirectInelastic.py
@@ -6,7 +6,7 @@
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init
from __future__ import (absolute_import, division, print_function)
-import stresstesting
+import systemtesting
from mantid.simpleapi import *
from mantid.api import Workspace
import os
@@ -18,7 +18,7 @@ from six import with_metaclass
#----------------------------------------------------------------------
-class ISISDirectInelasticReduction(with_metaclass(ABCMeta, stresstesting.MantidStressTest)):
+class ISISDirectInelasticReduction(with_metaclass(ABCMeta, systemtesting.MantidSystemTest)):
"""A base class for the ISIS direct inelastic tests
The workflow is defined in the runTest() method, simply
@@ -76,7 +76,7 @@ class ISISDirectInelasticReduction(with_metaclass(ABCMeta, stresstesting.MantidS
return isinstance(obj, Workspace)
def __init__(self):
- stresstesting.MantidStressTest.__init__(self)
+ systemtesting.MantidSystemTest.__init__(self)
# this is temporary parameter
self.scale_to_fix_abf=1
@@ -476,7 +476,7 @@ class MERLINReduction(ISISDirectInelasticReduction):
#
-class LETReduction(stresstesting.MantidStressTest):
+class LETReduction(systemtesting.MantidSystemTest):
tolerance = 1e-6
tolerance_is_reller=True
@@ -507,7 +507,7 @@ class LETReduction(stresstesting.MantidStressTest):
return self.ws_name, "LETReduction.nxs"
-class LETReductionEvent2015Multirep(stresstesting.MantidStressTest):
+class LETReductionEvent2015Multirep(systemtesting.MantidSystemTest):
"""
written in a hope that most of the stuff find here will eventually find its way into main reduction routines
"""
diff --git a/Testing/SystemTests/tests/analysis/ISISDirectReductionComponents.py b/Testing/SystemTests/tests/analysis/ISISDirectReductionComponents.py
index 613554514d8effbe9ed32a238293035e928fd4e9..8512f61760ad318533fe28474e74f91512eba26d 100644
--- a/Testing/SystemTests/tests/analysis/ISISDirectReductionComponents.py
+++ b/Testing/SystemTests/tests/analysis/ISISDirectReductionComponents.py
@@ -8,7 +8,7 @@
from __future__ import (absolute_import, division, print_function)
import os
import sys
-import stresstesting
+import systemtesting
from mantid.simpleapi import *
from mantid.api import Workspace,IEventWorkspace
@@ -22,9 +22,9 @@ except ImportError:
#----------------------------------------------------------------------
-class ISIS_ReductionWebLike(stresstesting.MantidStressTest):
+class ISIS_ReductionWebLike(systemtesting.MantidSystemTest):
def __init__(self):
- stresstesting.MantidStressTest.__init__(self)
+ systemtesting.MantidSystemTest.__init__(self)
# prepare reduction variable
self.rd = mr.ReduceMARIFromFile()
@@ -90,9 +90,9 @@ class ISIS_ReductionWebLike(stresstesting.MantidStressTest):
return result, reference
-class ISIS_ReductionWrapperValidate(stresstesting.MantidStressTest):
+class ISIS_ReductionWrapperValidate(systemtesting.MantidSystemTest):
def __init__(self):
- stresstesting.MantidStressTest.__init__(self)
+ systemtesting.MantidSystemTest.__init__(self)
self.result = False
def runTest(self):
@@ -138,10 +138,10 @@ class ISIS_ReductionWrapperValidate(stresstesting.MantidStressTest):
#----------------------------------------------------------------------
-class ISISLoadFilesRAW(stresstesting.MantidStressTest):
+class ISISLoadFilesRAW(systemtesting.MantidSystemTest):
def __init__(self):
- stresstesting.MantidStressTest.__init__(self)
+ systemtesting.MantidSystemTest.__init__(self)
self.valid = False
def runTest(self):
@@ -184,10 +184,10 @@ class ISISLoadFilesRAW(stresstesting.MantidStressTest):
return self.valid
-class ISISLoadFilesMER(stresstesting.MantidStressTest):
+class ISISLoadFilesMER(systemtesting.MantidSystemTest):
def __init__(self):
- stresstesting.MantidStressTest.__init__(self)
+ systemtesting.MantidSystemTest.__init__(self)
self.valid = False
def runTest(self):
@@ -265,10 +265,10 @@ class ISISLoadFilesMER(stresstesting.MantidStressTest):
return self.valid
-class ISISLoadFilesLET(stresstesting.MantidStressTest):
+class ISISLoadFilesLET(systemtesting.MantidSystemTest):
def __init__(self):
- stresstesting.MantidStressTest.__init__(self)
+ systemtesting.MantidSystemTest.__init__(self)
self.valid = False
def runTest(self):
diff --git a/Testing/SystemTests/tests/analysis/ISISIndirectAnalysisTest.py b/Testing/SystemTests/tests/analysis/ISISIndirectAnalysisTest.py
index 4963f47a362005b6370ea2edf969078d354a53e7..40bf355e73e4f6fcec10ad95cfde6e0e420beb0c 100644
--- a/Testing/SystemTests/tests/analysis/ISISIndirectAnalysisTest.py
+++ b/Testing/SystemTests/tests/analysis/ISISIndirectAnalysisTest.py
@@ -5,11 +5,11 @@
# & Institut Laue - Langevin
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init,attribute-defined-outside-init
-import stresstesting
+import systemtesting
from mantid.simpleapi import *
-class ElasticWindowMultipleTest(stresstesting.MantidStressTest):
+class ElasticWindowMultipleTest(systemtesting.MantidSystemTest):
def runTest(self):
Load(Filename='osi92762_graphite002_red.nxs,osi92763_graphite002_red.nxs',
diff --git a/Testing/SystemTests/tests/analysis/ISISIndirectBayesTest.py b/Testing/SystemTests/tests/analysis/ISISIndirectBayesTest.py
index 52bd5a2fe00b34bf3d98594511e7e0273e917bc0..762a679465afcf20c7300d6206be2970febadcff 100644
--- a/Testing/SystemTests/tests/analysis/ISISIndirectBayesTest.py
+++ b/Testing/SystemTests/tests/analysis/ISISIndirectBayesTest.py
@@ -6,7 +6,7 @@
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init,attribute-defined-outside-init, too-few-public-methods
from __future__ import (absolute_import, division, print_function)
-import stresstesting
+import systemtesting
import os
from abc import ABCMeta, abstractmethod
from mantid.simpleapi import *
@@ -31,7 +31,7 @@ def _cleanup_files(dirname, filenames):
#==============================================================================
-class QLresTest(stresstesting.MantidStressTest):
+class QLresTest(systemtesting.MantidSystemTest):
def skipTests(self):
return not platform.system() == "Windows"
@@ -75,7 +75,7 @@ class QLresTest(stresstesting.MantidStressTest):
#==============================================================================
-class ResNormTest(stresstesting.MantidStressTest):
+class ResNormTest(systemtesting.MantidSystemTest):
def skipTests(self):
return not platform.system() == "Windows"
@@ -107,7 +107,7 @@ class ResNormTest(stresstesting.MantidStressTest):
#==============================================================================
-class QuestTest(stresstesting.MantidStressTest):
+class QuestTest(systemtesting.MantidSystemTest):
def skipTests(self):
return not platform.system() == "Windows"
@@ -146,7 +146,7 @@ class QuestTest(stresstesting.MantidStressTest):
#==============================================================================
-class QSeTest(stresstesting.MantidStressTest):
+class QSeTest(systemtesting.MantidSystemTest):
def skipTests(self):
return not platform.system() == "Windows"
@@ -188,7 +188,7 @@ class QSeTest(stresstesting.MantidStressTest):
#==============================================================================
-class QLDataTest(stresstesting.MantidStressTest):
+class QLDataTest(systemtesting.MantidSystemTest):
def skipTests(self):
return not platform.system() == "Windows"
@@ -232,7 +232,7 @@ class QLDataTest(stresstesting.MantidStressTest):
#==============================================================================
-class QLResNormTest(stresstesting.MantidStressTest):
+class QLResNormTest(systemtesting.MantidSystemTest):
def skipTests(self):
return not platform.system() == "Windows"
@@ -280,7 +280,7 @@ class QLResNormTest(stresstesting.MantidStressTest):
#==============================================================================
-class QLWidthTest(stresstesting.MantidStressTest):
+class QLWidthTest(systemtesting.MantidSystemTest):
def skipTests(self):
return not platform.system() == "Windows"
@@ -324,10 +324,10 @@ class QLWidthTest(stresstesting.MantidStressTest):
#==============================================================================
-class JumpFitFunctionTestBase(with_metaclass(ABCMeta, stresstesting.MantidStressTest)):
+class JumpFitFunctionTestBase(with_metaclass(ABCMeta, systemtesting.MantidSystemTest)):
def __init__(self):
- stresstesting.MantidStressTest.__init__(self)
+ systemtesting.MantidSystemTest.__init__(self)
self._sample_name = 'irs26176_graphite002_QLr_Workspace'
self._q_range = [0.6, 1.705600]
diff --git a/Testing/SystemTests/tests/analysis/ISISIndirectInelastic.py b/Testing/SystemTests/tests/analysis/ISISIndirectInelastic.py
index d4a0e22be3c9d0f871d699c6d45a82875c55dfa3..ef40423a6ca63f5221ee0b049ac794e4f232e579 100644
--- a/Testing/SystemTests/tests/analysis/ISISIndirectInelastic.py
+++ b/Testing/SystemTests/tests/analysis/ISISIndirectInelastic.py
@@ -21,7 +21,7 @@ For diagrams on the intended work flow of the IDR and IDA interfaces see:
System test class hierarchy as shown below:
-stresstesting.MantidStressTest
+systemtesting.MantidSystemTest
|
+--ISISIndirectInelasticBase
|
@@ -74,7 +74,7 @@ stresstesting.MantidStressTest
'''
from __future__ import (absolute_import, division, print_function)
-import stresstesting
+import systemtesting
from abc import ABCMeta, abstractmethod
from mantid.simpleapi import *
@@ -85,7 +85,7 @@ import platform
from six import with_metaclass
-class ISISIndirectInelasticBase(with_metaclass(ABCMeta, stresstesting.MantidStressTest)):
+class ISISIndirectInelasticBase(with_metaclass(ABCMeta, systemtesting.MantidSystemTest)):
'''
A common base class for the ISISIndirectInelastic* base classes.
'''
diff --git a/Testing/SystemTests/tests/analysis/ISISIndirectLoadAsciiTest.py b/Testing/SystemTests/tests/analysis/ISISIndirectLoadAsciiTest.py
index 8b6525c88ac0d55757852178e5ed077a005b806c..6d858ab6776b69b5ec94b5d27a8292a14e4c3bfc 100644
--- a/Testing/SystemTests/tests/analysis/ISISIndirectLoadAsciiTest.py
+++ b/Testing/SystemTests/tests/analysis/ISISIndirectLoadAsciiTest.py
@@ -6,13 +6,13 @@
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init,attribute-defined-outside-init
from __future__ import (absolute_import, division, print_function)
-import stresstesting
+import systemtesting
import mantid.simpleapi as ms
#====================================================================================================
-class IN10SiliconTest(stresstesting.MantidStressTest):
+class IN10SiliconTest(systemtesting.MantidSystemTest):
def runTest(self):
import IndirectNeutron as Main
@@ -35,7 +35,7 @@ class IN10SiliconTest(stresstesting.MantidStressTest):
#====================================================================================================
-class IN13CaFTest(stresstesting.MantidStressTest):
+class IN13CaFTest(systemtesting.MantidSystemTest):
def runTest(self):
import IndirectNeutron as Main
@@ -85,7 +85,7 @@ class IN13CaFTest(stresstesting.MantidStressTest):
#====================================================================================================
-class IN16SiliconTest(stresstesting.MantidStressTest):
+class IN16SiliconTest(systemtesting.MantidSystemTest):
def runTest(self):
import IndirectNeutron as Main
diff --git a/Testing/SystemTests/tests/analysis/ISISIndirectSimulationTest.py b/Testing/SystemTests/tests/analysis/ISISIndirectSimulationTest.py
index 7f78fc8e090f7422eadb759a6e52d6f3282bd1f6..e6e40997b2583c7edfee9f99f956e4e919405abf 100644
--- a/Testing/SystemTests/tests/analysis/ISISIndirectSimulationTest.py
+++ b/Testing/SystemTests/tests/analysis/ISISIndirectSimulationTest.py
@@ -6,13 +6,13 @@
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init,attribute-defined-outside-init
from __future__ import (absolute_import, division, print_function)
-import stresstesting
+import systemtesting
import mantid.simpleapi as ms
#====================================================================================================
-class MolDynCdlTest(stresstesting.MantidStressTest):
+class MolDynCdlTest(systemtesting.MantidSystemTest):
def runTest(self):
ms.MolDyn(Data='DISF_NaF.cdl',
@@ -58,7 +58,7 @@ class MolDynCdlTest(stresstesting.MantidStressTest):
#====================================================================================================
-class MolDynDatTest(stresstesting.MantidStressTest):
+class MolDynDatTest(systemtesting.MantidSystemTest):
def runTest(self):
ms.MolDyn(Data='WSH_test.dat',
diff --git a/Testing/SystemTests/tests/analysis/ISISLoadingEventData.py b/Testing/SystemTests/tests/analysis/ISISLoadingEventData.py
index 9c4206f4e74d089790aec098d243ba4546d90bd4..6cc28ccc6a45ac1aa2f818b3e27783942d9c7f45 100644
--- a/Testing/SystemTests/tests/analysis/ISISLoadingEventData.py
+++ b/Testing/SystemTests/tests/analysis/ISISLoadingEventData.py
@@ -5,11 +5,11 @@
# & Institut Laue - Langevin
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init
-import stresstesting
+import systemtesting
from mantid.simpleapi import LoadEventNexus
-class ISISLoadingEventData(stresstesting.MantidStressTest):
+class ISISLoadingEventData(systemtesting.MantidSystemTest):
"""Older ISIS event files were actually, effectively, very finely-binned
histograms where each "event" was assigned the TOF at the centre of a bin.
Attempting to bin this type of data from event mode to histogram mode would
diff --git a/Testing/SystemTests/tests/analysis/ISISMuonAnalysis.py b/Testing/SystemTests/tests/analysis/ISISMuonAnalysis.py
index a0d40fd023a9b7c5295660fdd371c739c01a74d7..9f74adee4b7eaafb9bc5fd5caf25debb5064c002 100644
--- a/Testing/SystemTests/tests/analysis/ISISMuonAnalysis.py
+++ b/Testing/SystemTests/tests/analysis/ISISMuonAnalysis.py
@@ -7,7 +7,7 @@
#pylint: disable=no-init,invalid-name,attribute-defined-outside-init,too-many-instance-attributes,too-few-public-methods
from __future__ import (absolute_import, division, print_function)
import math
-import stresstesting
+import systemtesting
from mantid.simpleapi import *
from abc import ABCMeta, abstractmethod
@@ -16,7 +16,7 @@ from six import with_metaclass
#----------------------------------------------------------------------
-class ISISMuonAnalysis(with_metaclass(ABCMeta, stresstesting.MantidStressTest)):
+class ISISMuonAnalysis(with_metaclass(ABCMeta, systemtesting.MantidSystemTest)):
"""A base class for the ISIS Muon Analysis tests
The workflow is defined in the runTest() method, simply
diff --git a/Testing/SystemTests/tests/analysis/ISISMuonAnalysisGrouping.py b/Testing/SystemTests/tests/analysis/ISISMuonAnalysisGrouping.py
index 358a8f1b3f2feabe337098f1f0230f9dfa55e051..331d2a425b4e9735e35ace0cbf7f42dad7e23a01 100644
--- a/Testing/SystemTests/tests/analysis/ISISMuonAnalysisGrouping.py
+++ b/Testing/SystemTests/tests/analysis/ISISMuonAnalysisGrouping.py
@@ -6,7 +6,7 @@
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init,attribute-defined-outside-init,too-many-instance-attributes,too-few-public-methods
from __future__ import (absolute_import, division, print_function)
-import stresstesting
+import systemtesting
from mantid.simpleapi import *
from abc import ABCMeta, abstractmethod
@@ -15,7 +15,7 @@ from six import with_metaclass
#----------------------------------------------------------------------
-class ISISMuonAnalysisGrouping(with_metaclass(ABCMeta, stresstesting.MantidStressTest)):
+class ISISMuonAnalysisGrouping(with_metaclass(ABCMeta, systemtesting.MantidSystemTest)):
"""A base class for the ISIS Muon Analysis tests
The workflow is defined in the runTest() method, simply
diff --git a/Testing/SystemTests/tests/analysis/ISISReflInstrumentIDFTest.py b/Testing/SystemTests/tests/analysis/ISISReflInstrumentIDFTest.py
index 6875f28887da68af3ef7f890529ceb206287ca28..7d1f94129a083ea25debcbbaf58776120d045f07 100644
--- a/Testing/SystemTests/tests/analysis/ISISReflInstrumentIDFTest.py
+++ b/Testing/SystemTests/tests/analysis/ISISReflInstrumentIDFTest.py
@@ -10,14 +10,14 @@ These system tests are to verify that the IDF and parameter files for POLREF, CR
"""
from __future__ import (absolute_import, division, print_function)
-import stresstesting
+import systemtesting
from mantid.simpleapi import *
import os
from abc import ABCMeta, abstractmethod
from six import with_metaclass
-class ISISReflInstrumentIDFTest(with_metaclass(ABCMeta, stresstesting.MantidStressTest)):
+class ISISReflInstrumentIDFTest(with_metaclass(ABCMeta, systemtesting.MantidSystemTest)):
@abstractmethod
def get_IDF_name(self):
diff --git a/Testing/SystemTests/tests/analysis/ISISReflectometryAutoreductionTest.py b/Testing/SystemTests/tests/analysis/ISISReflectometryAutoreductionTest.py
index a905f7b226251d38667b44b9a96d8fc8f2776247..d1e68d805899d16566daeca2ac4b7cb50f6a5c23 100644
--- a/Testing/SystemTests/tests/analysis/ISISReflectometryAutoreductionTest.py
+++ b/Testing/SystemTests/tests/analysis/ISISReflectometryAutoreductionTest.py
@@ -11,14 +11,14 @@ Adapted from scripts provided by Max Skoda.
import re
import itertools
import math
-import stresstesting
+import systemtesting
from operator import itemgetter
from mantid.simpleapi import *
from mantid import ConfigService
from isis_reflectometry.combineMulti import combineDataMulti, getWorkspace
-class ISISReflectometryAutoreductionTest(stresstesting.MantidStressTest):
+class ISISReflectometryAutoreductionTest(systemtesting.MantidSystemTest):
# NOTE: When updating the run range used be sure to update the run_titles table below.
# You may also find the regenerate functions useful.
investigation_id = 1710262
diff --git a/Testing/SystemTests/tests/analysis/ISIS_PowderGemTest.py b/Testing/SystemTests/tests/analysis/ISIS_PowderGemTest.py
index 9bdf81413de1e64343ff6a03fea84ce51e669ffb..227acc420d0c2a1498b789a7ef5b9085c1901606 100644
--- a/Testing/SystemTests/tests/analysis/ISIS_PowderGemTest.py
+++ b/Testing/SystemTests/tests/analysis/ISIS_PowderGemTest.py
@@ -7,7 +7,7 @@
from __future__ import (absolute_import, division, print_function)
import os
-import stresstesting
+import systemtesting
import shutil
import mantid.simpleapi as mantid
@@ -44,7 +44,7 @@ calibration_dir = os.path.join(input_dir, calibration_folder_name)
spline_path = os.path.join(calibration_dir, spline_rel_path)
-class CreateVanadiumTest(stresstesting.MantidStressTest):
+class CreateVanadiumTest(systemtesting.MantidSystemTest):
calibration_results = None
existing_config = config['datasearch.directories']
@@ -69,7 +69,7 @@ class CreateVanadiumTest(stresstesting.MantidStressTest):
config['datasearch.directories'] = self.existing_config
-class FocusTest(stresstesting.MantidStressTest):
+class FocusTest(systemtesting.MantidSystemTest):
focus_results = None
existing_config = config['datasearch.directories']
diff --git a/Testing/SystemTests/tests/analysis/ISIS_PowderGeneric.py b/Testing/SystemTests/tests/analysis/ISIS_PowderGeneric.py
index 3f5cd581439531f43d61b6d7d5cd38f264c7f792..d9ffef0fb39ab84eeb012250279a46727970163c 100644
--- a/Testing/SystemTests/tests/analysis/ISIS_PowderGeneric.py
+++ b/Testing/SystemTests/tests/analysis/ISIS_PowderGeneric.py
@@ -5,11 +5,11 @@
# & Institut Laue - Langevin
# SPDX - License - Identifier: GPL - 3.0 +
from __future__ import (absolute_import, division, print_function)
-import stresstesting
+import systemtesting
from mantid.simpleapi import *
-class PEARLPowderDiffraction(stresstesting.MantidStressTest):
+class PEARLPowderDiffraction(systemtesting.MantidSystemTest):
sample = "PEARL00073987.raw"
calfile = "pearl_offset_11_4.cal"
diff --git a/Testing/SystemTests/tests/analysis/ISIS_PowderHRPDTest.py b/Testing/SystemTests/tests/analysis/ISIS_PowderHRPDTest.py
index b79b5e911f2f4a57a451510ab75072d1be49b3e5..ba72494a1016bed426daa0fd20176ccfd432eb59 100644
--- a/Testing/SystemTests/tests/analysis/ISIS_PowderHRPDTest.py
+++ b/Testing/SystemTests/tests/analysis/ISIS_PowderHRPDTest.py
@@ -9,7 +9,7 @@ from __future__ import (absolute_import, division, print_function)
import os
import platform
import shutil
-import stresstesting
+import systemtesting
import mantid.simpleapi as mantid
from mantid import config
@@ -47,7 +47,7 @@ calibration_dir = os.path.join(input_dir, calibration_folder_name)
spline_path = os.path.join(calibration_dir, spline_rel_path)
-class CreateVanadiumTest(stresstesting.MantidStressTest):
+class CreateVanadiumTest(systemtesting.MantidSystemTest):
calibration_results = None
existing_config = config['datasearch.directories']
@@ -72,7 +72,7 @@ class CreateVanadiumTest(stresstesting.MantidStressTest):
config['datasearch.directories'] = self.existing_config
-class FocusTest(stresstesting.MantidStressTest):
+class FocusTest(systemtesting.MantidSystemTest):
focus_results = None
existing_config = config["datasearch.directories"]
diff --git a/Testing/SystemTests/tests/analysis/ISIS_PowderPearlTest.py b/Testing/SystemTests/tests/analysis/ISIS_PowderPearlTest.py
index 4d6c5894cee8795971387039f303a915d0958ad9..eaf06ed988fc6589f648c9360a49bb04444faf37 100644
--- a/Testing/SystemTests/tests/analysis/ISIS_PowderPearlTest.py
+++ b/Testing/SystemTests/tests/analysis/ISIS_PowderPearlTest.py
@@ -7,7 +7,7 @@
from __future__ import (absolute_import, division, print_function)
import os
-import stresstesting
+import systemtesting
import shutil
import mantid.simpleapi as mantid
@@ -44,7 +44,7 @@ calibration_dir = os.path.join(input_dir, calibration_folder_name)
spline_path = os.path.join(calibration_dir, spline_rel_path)
-class _CreateVanadiumTest(stresstesting.MantidStressTest):
+class _CreateVanadiumTest(systemtesting.MantidSystemTest):
existing_config = config['datasearch.directories']
focus_mode = None
@@ -106,7 +106,7 @@ class CreateVanadiumModsTest(_CreateVanadiumTest):
return False
-class FocusTest(stresstesting.MantidStressTest):
+class FocusTest(systemtesting.MantidSystemTest):
focus_results = None
existing_config = config['datasearch.directories']
@@ -136,7 +136,7 @@ class FocusTest(stresstesting.MantidStressTest):
mantid.mtd.clear()
-class FocusWithAbsorbCorrectionsTest(stresstesting.MantidStressTest):
+class FocusWithAbsorbCorrectionsTest(systemtesting.MantidSystemTest):
focus_results = None
existing_config = config["datasearch.directories"]
@@ -160,7 +160,7 @@ class FocusWithAbsorbCorrectionsTest(stresstesting.MantidStressTest):
mantid.mtd.clear()
-class CreateCalTest(stresstesting.MantidStressTest):
+class CreateCalTest(systemtesting.MantidSystemTest):
calibration_results = None
existing_config = config["datasearch.directories"]
diff --git a/Testing/SystemTests/tests/analysis/ISIS_PowderPolarisTest.py b/Testing/SystemTests/tests/analysis/ISIS_PowderPolarisTest.py
index a1e800d421710a9c0384d149c28f756ebb9fe512..9150ca2b7257a42ed52735b92e7509954c84fbee 100644
--- a/Testing/SystemTests/tests/analysis/ISIS_PowderPolarisTest.py
+++ b/Testing/SystemTests/tests/analysis/ISIS_PowderPolarisTest.py
@@ -7,7 +7,7 @@
from __future__ import (absolute_import, division, print_function)
import os
-import stresstesting
+import systemtesting
import shutil
import mantid.simpleapi as mantid
@@ -48,7 +48,7 @@ unsplined_van_path = os.path.join(calibration_dir, unsplined_van_rel_path)
total_scattering_input_file = os.path.join(input_dir, "ISIS_Powder-POLARIS98533_TotalScatteringInput.nxs")
-class CreateVanadiumTest(stresstesting.MantidStressTest):
+class CreateVanadiumTest(systemtesting.MantidSystemTest):
calibration_results = None
existing_config = config['datasearch.directories']
@@ -76,7 +76,7 @@ class CreateVanadiumTest(stresstesting.MantidStressTest):
config['datasearch.directories'] = self.existing_config
-class FocusTest(stresstesting.MantidStressTest):
+class FocusTest(systemtesting.MantidSystemTest):
focus_results = None
existing_config = config['datasearch.directories']
@@ -104,7 +104,7 @@ class FocusTest(stresstesting.MantidStressTest):
mantid.mtd.clear()
-class TotalScatteringTest(stresstesting.MantidStressTest):
+class TotalScatteringTest(systemtesting.MantidSystemTest):
pdf_output = None
diff --git a/Testing/SystemTests/tests/analysis/ISIS_WISHDiffractionFocussing.py b/Testing/SystemTests/tests/analysis/ISIS_WISHDiffractionFocussing.py
index d93a102a2ea6bd829cd30507ac48dcd362110ad0..1988c9115a0947b5f3fed597b817a9bd88212f15 100644
--- a/Testing/SystemTests/tests/analysis/ISIS_WISHDiffractionFocussing.py
+++ b/Testing/SystemTests/tests/analysis/ISIS_WISHDiffractionFocussing.py
@@ -6,12 +6,12 @@
# SPDX - License - Identifier: GPL - 3.0 +
from __future__ import (absolute_import, division, print_function)
from mantid.simpleapi import *
-import stresstesting
+import systemtesting
import os.path
import numpy as np
-class WISHDiffractionFocussingReductionTest(stresstesting.MantidStressTest):
+class WISHDiffractionFocussingReductionTest(systemtesting.MantidSystemTest):
def requiredFiles(self):
return ["WISH00035991.raw", "35922_h00_RW.cal", "35991-foc-h00.nxs"]
@@ -80,7 +80,7 @@ class WISHDiffractionFocussingReductionTest(stresstesting.MantidStressTest):
return ws, "35991-foc-h00.nxs"
-class WISHDiffractionFocussingAnalysisTest(stresstesting.MantidStressTest):
+class WISHDiffractionFocussingAnalysisTest(systemtesting.MantidSystemTest):
def requiredFiles(self):
return ["35979-foc-h00.nxs",
diff --git a/Testing/SystemTests/tests/analysis/ISIS_WISHPowderReductionTest.py b/Testing/SystemTests/tests/analysis/ISIS_WISHPowderReductionTest.py
index c3dbf4d535d8dd0fc5e5f2bae32ddb0a4b4b45af..ad9bf484c4add564a0beef9d0349ed4516b950cc 100644
--- a/Testing/SystemTests/tests/analysis/ISIS_WISHPowderReductionTest.py
+++ b/Testing/SystemTests/tests/analysis/ISIS_WISHPowderReductionTest.py
@@ -1,4 +1,4 @@
-from stresstesting import MantidStressTest
+from systemtesting import MantidSystemTest
from wish.reduce import Wish_Run
from mantid import config
@@ -29,7 +29,7 @@ output_dir = os.path.join(working_dir, output_folder_name)
calibration_dir = os.path.join(input_dir, calibration_folder_name)
-class WISHPowderReductionTest(MantidStressTest):
+class WISHPowderReductionTest(MantidSystemTest):
# still missing required files check with ./systemtest -R PowderReduction --showskipped
def requiredFiles(self):
input_files = ["WISHvana41865-1foc.nxs", "WISHvana41865-2foc.nxs", "WISHvana41865-3foc.nxs",
diff --git a/Testing/SystemTests/tests/analysis/ISIS_WISHSingleCrystalReduction.py b/Testing/SystemTests/tests/analysis/ISIS_WISHSingleCrystalReduction.py
index dc374f7a4da7cce6bced9c548acd1620711e4157..53ae046ce81e2b5f633fbd0d1976890e083f7c2a 100644
--- a/Testing/SystemTests/tests/analysis/ISIS_WISHSingleCrystalReduction.py
+++ b/Testing/SystemTests/tests/analysis/ISIS_WISHSingleCrystalReduction.py
@@ -5,7 +5,7 @@
# & Institut Laue - Langevin
# SPDX - License - Identifier: GPL - 3.0 +
from collections import namedtuple
-from stresstesting import MantidStressTest
+from systemtesting import MantidSystemTest
from mantid.simpleapi import (ConvertUnits, LoadRaw, FilterPeaks, PredictPeaks, SetUB, SaveIsawPeaks)
from mantid import config
@@ -13,7 +13,7 @@ import numpy as np
import os
-class WISHSingleCrystalPeakPredictionTest(MantidStressTest):
+class WISHSingleCrystalPeakPredictionTest(MantidSystemTest):
"""
At the time of writing WISH users rely quite heavily on the PredictPeaks
algorithm. As WISH has tubes rather than rectangular detectors sometimes
diff --git a/Testing/SystemTests/tests/analysis/IndirectDiffractionTests.py b/Testing/SystemTests/tests/analysis/IndirectDiffractionTests.py
index ea0da9f21cbc2b23041dde1051028dfb475dc9a0..74dba80c9ad6ce2ac6080b2b0621ce8d64abe74e 100644
--- a/Testing/SystemTests/tests/analysis/IndirectDiffractionTests.py
+++ b/Testing/SystemTests/tests/analysis/IndirectDiffractionTests.py
@@ -9,13 +9,13 @@
from __future__ import (absolute_import, division, print_function)
from abc import ABCMeta, abstractmethod
-import stresstesting
+import systemtesting
import mantid.simpleapi as ms
from mantid import mtd
from six import with_metaclass
-class ISISIndirectDiffractionReduction(with_metaclass(ABCMeta, stresstesting.MantidStressTest)):
+class ISISIndirectDiffractionReduction(with_metaclass(ABCMeta, systemtesting.MantidSystemTest)):
"""
Base class for tests that use the ISISIndirectDiffractionReduction algorithm.
"""
@@ -105,7 +105,7 @@ class OSIRISDiffspecDiffractionTest(ISISIndirectDiffractionReduction):
#-------------------------------------------------------------------------------
-class OSIRISDiffonlyDiffractionTest(stresstesting.MantidStressTest):
+class OSIRISDiffonlyDiffractionTest(systemtesting.MantidSystemTest):
def runTest(self):
ms.OSIRISDiffractionReduction(OutputWorkspace="OsirisDiffractionTest",
diff --git a/Testing/SystemTests/tests/analysis/L2QScriptTest.py b/Testing/SystemTests/tests/analysis/L2QScriptTest.py
index 1ff14a8e83aafa0a5209cbd07ae9e780b7586d6f..a8c23dcd08ee9ff0f9eaac8189962f183b918ec6 100644
--- a/Testing/SystemTests/tests/analysis/L2QScriptTest.py
+++ b/Testing/SystemTests/tests/analysis/L2QScriptTest.py
@@ -6,12 +6,12 @@
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init,invalid-name
-import stresstesting
+import systemtesting
from mantid.simpleapi import *
from isis_reflectometry.l2q import *
-class L2QScriptTest(stresstesting.MantidStressTest):
+class L2QScriptTest(systemtesting.MantidSystemTest):
def runTest(self):
ws = Load(Filename="INTER00013469.nxs")
diff --git a/Testing/SystemTests/tests/analysis/LOQAddBatch.py b/Testing/SystemTests/tests/analysis/LOQAddBatch.py
index 26864b6b5313ce7e58452a7e0c1c4243a51dd3e2..4c94fdfcc18cf4ea06c5e7b74c50d8286021b6af 100644
--- a/Testing/SystemTests/tests/analysis/LOQAddBatch.py
+++ b/Testing/SystemTests/tests/analysis/LOQAddBatch.py
@@ -6,7 +6,7 @@
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init,invalid-name,attribute-defined-outside-init
from __future__ import (absolute_import, division, print_function)
-import stresstesting
+import systemtesting
from mantid.simpleapi import *
from mantid.api import FileFinder
from mantid import config
@@ -17,7 +17,7 @@ import SANSadd2 as sansadd
import os
-class SANSAddBatch(stresstesting.MantidStressTest):
+class SANSAddBatch(systemtesting.MantidSystemTest):
output_file = '99630sannotrans'
csv_file = 'input.csv'
result = ''
diff --git a/Testing/SystemTests/tests/analysis/LOQCentreNoGrav.py b/Testing/SystemTests/tests/analysis/LOQCentreNoGrav.py
index fb0268c0d1dd8164750b91974988be42b5b49b05..f02fe6a2094cbad98b7bfcc88da58d5de388689c 100644
--- a/Testing/SystemTests/tests/analysis/LOQCentreNoGrav.py
+++ b/Testing/SystemTests/tests/analysis/LOQCentreNoGrav.py
@@ -6,14 +6,14 @@
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init
from __future__ import (absolute_import, division, print_function)
-import stresstesting
+import systemtesting
from mantid.simpleapi import *
from ISISCommandInterface import *
-class LOQCentreNoGrav(stresstesting.MantidStressTest):
+class LOQCentreNoGrav(systemtesting.MantidSystemTest):
def __init__(self):
- stresstesting.MantidStressTest.__init__(self)
+ systemtesting.MantidSystemTest.__init__(self)
self.tolerance = 1e-6
def runTest(self):
@@ -38,7 +38,7 @@ class LOQCentreNoGrav(stresstesting.MantidStressTest):
return '54431main_1D_3.0_9.0','LOQCentreNoGravSearchCentreFixed.nxs'
-class LOQCentreNoGravDefineCentre(stresstesting.MantidStressTest):
+class LOQCentreNoGravDefineCentre(systemtesting.MantidSystemTest):
def runTest(self):
LOQ()
diff --git a/Testing/SystemTests/tests/analysis/LOQCentreNoGrav_V2.py b/Testing/SystemTests/tests/analysis/LOQCentreNoGrav_V2.py
index 67e826774c85398053b138ebdc609f81021651bc..dbedbdc55e61412cd78eb11e43e2d94b4bbaeb30 100644
--- a/Testing/SystemTests/tests/analysis/LOQCentreNoGrav_V2.py
+++ b/Testing/SystemTests/tests/analysis/LOQCentreNoGrav_V2.py
@@ -6,7 +6,7 @@
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init
from __future__ import (absolute_import, division, print_function)
-import stresstesting
+import systemtesting
import mantid # noqa
from sans.command_interface.ISISCommandInterface import (LOQ, Set1D, Detector, MaskFile, Gravity, AssignSample,
TransmissionSample, AssignCan, TransmissionCan,
@@ -14,9 +14,9 @@ from sans.command_interface.ISISCommandInterface import (LOQ, Set1D, Detector, M
UseCompatibilityMode, FindBeamCentre)
-class LOQCentreNoGrav(stresstesting.MantidStressTest):
+class LOQCentreNoGrav(systemtesting.MantidSystemTest):
def __init__(self):
- stresstesting.MantidStressTest.__init__(self)
+ systemtesting.MantidSystemTest.__init__(self)
self.tolerance = 1e-6
def runTest(self):
@@ -42,7 +42,7 @@ class LOQCentreNoGrav(stresstesting.MantidStressTest):
return '54431main_1D_3.0_9.0','LOQCentreNoGravSearchCentreFixed.nxs'
-class LOQCentreNoGravDefineCentreTest_V2(stresstesting.MantidStressTest):
+class LOQCentreNoGravDefineCentreTest_V2(systemtesting.MantidSystemTest):
def runTest(self):
UseCompatibilityMode()
LOQ()
diff --git a/Testing/SystemTests/tests/analysis/LOQReductionGUI.py b/Testing/SystemTests/tests/analysis/LOQReductionGUI.py
index 271898ded47a2aade7559d3ad2d794aba4def886..1c33d383325e3ba9a41864c8abc0071522fe38cc 100644
--- a/Testing/SystemTests/tests/analysis/LOQReductionGUI.py
+++ b/Testing/SystemTests/tests/analysis/LOQReductionGUI.py
@@ -7,7 +7,7 @@
#pylint: disable=attribute-defined-outside-init
from __future__ import (absolute_import, division, print_function)
-import stresstesting
+import systemtesting
from mantid.simpleapi import *
import ISISCommandInterface as i
@@ -15,7 +15,7 @@ MASKFILE = FileFinder.getFullPath('MaskLOQData.txt')
BATCHFILE = FileFinder.getFullPath('loq_batch_mode_reduction.csv')
-class LOQMinimalBatchReduction(stresstesting.MantidStressTest):
+class LOQMinimalBatchReduction(systemtesting.MantidSystemTest):
def __init__(self):
super(LOQMinimalBatchReduction, self).__init__()
config['default.instrument'] = 'LOQ'
diff --git a/Testing/SystemTests/tests/analysis/LOQReductionGUITest_V2.py b/Testing/SystemTests/tests/analysis/LOQReductionGUITest_V2.py
index 0c01c7de5b0fcd6d5fe7320908b070c5baeb66de..16cea63328a86677b047d736a51c797fc2148fec 100644
--- a/Testing/SystemTests/tests/analysis/LOQReductionGUITest_V2.py
+++ b/Testing/SystemTests/tests/analysis/LOQReductionGUITest_V2.py
@@ -6,7 +6,7 @@
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=attribute-defined-outside-init
from __future__ import (absolute_import, division, print_function)
-import stresstesting
+import systemtesting
from mantid.kernel import config
from mantid.api import FileFinder
from sans.command_interface.ISISCommandInterface import (UseCompatibilityMode, LOQ, MaskFile, BatchReduce)
@@ -15,7 +15,7 @@ MASKFILE = FileFinder.getFullPath('MaskLOQData.txt')
BATCHFILE = FileFinder.getFullPath('loq_batch_mode_reduction.csv')
-class LOQMinimalBatchReductionTest_V2(stresstesting.MantidStressTest):
+class LOQMinimalBatchReductionTest_V2(systemtesting.MantidSystemTest):
def __init__(self):
super(LOQMinimalBatchReductionTest_V2, self).__init__()
config['default.instrument'] = 'LOQ'
diff --git a/Testing/SystemTests/tests/analysis/LOQSANSUtilityTest.py b/Testing/SystemTests/tests/analysis/LOQSANSUtilityTest.py
index cbd1c9c983611cfff7a6274287d897d51ebc9c5b..4fe6383dc2998202a9d0e384d96b3832249eeb73 100644
--- a/Testing/SystemTests/tests/analysis/LOQSANSUtilityTest.py
+++ b/Testing/SystemTests/tests/analysis/LOQSANSUtilityTest.py
@@ -7,7 +7,7 @@
#pylint: disable=invalid-name,no-init,too-few-public-methods
from __future__ import (absolute_import, division, print_function)
-import stresstesting
+import systemtesting
from mantid.simpleapi import *
import SANSUtility as su
import SANSadd2 as add
@@ -19,7 +19,7 @@ def unixLikePathFromWorkspace(ws):
return su.getFilePathFromWorkspace(ws).replace('\\','/')
-class SANSUtilityTest(stresstesting.MantidStressTest):
+class SANSUtilityTest(systemtesting.MantidSystemTest):
def runTest(self):
# created after issue reported in #8156
diff --git a/Testing/SystemTests/tests/analysis/LOQTransFitWorkspace2D.py b/Testing/SystemTests/tests/analysis/LOQTransFitWorkspace2D.py
index f5ad2d454a8e255d78204f328fcc0194b0e5bf6a..ce0caa7e276a8f46ce6d31e0d34891c37e725047 100644
--- a/Testing/SystemTests/tests/analysis/LOQTransFitWorkspace2D.py
+++ b/Testing/SystemTests/tests/analysis/LOQTransFitWorkspace2D.py
@@ -7,12 +7,12 @@
#pylint: disable=no-init
from __future__ import (absolute_import, division, print_function)
-import stresstesting
+import systemtesting
from mantid.simpleapi import *
from ISISCommandInterface import *
-class LOQTransFitWorkspace2D(stresstesting.MantidStressTest):
+class LOQTransFitWorkspace2D(systemtesting.MantidSystemTest):
"""
Tests the SANS interface commands TransFit() and TransWorkspace(). Also tests
a LOQ reduction in 2D with can and transmission files
diff --git a/Testing/SystemTests/tests/analysis/LRPrimaryFractionTest.py b/Testing/SystemTests/tests/analysis/LRPrimaryFractionTest.py
index 9c5420c9854b62715f2bd39b0e9472b461b3e60d..eab3fda172c656b2fa1a07864f84164774d0f840 100644
--- a/Testing/SystemTests/tests/analysis/LRPrimaryFractionTest.py
+++ b/Testing/SystemTests/tests/analysis/LRPrimaryFractionTest.py
@@ -5,12 +5,12 @@
# & Institut Laue - Langevin
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init,attribute-defined-outside-init
-import stresstesting
+import systemtesting
from mantid import *
from mantid.simpleapi import *
-class LRPrimaryFractionTest(stresstesting.MantidStressTest):
+class LRPrimaryFractionTest(systemtesting.MantidSystemTest):
scaling_factor = None
def runTest(self):
@@ -28,7 +28,7 @@ class LRPrimaryFractionTest(stresstesting.MantidStressTest):
return True
-class LRPrimaryFractionWithRangeTest(stresstesting.MantidStressTest):
+class LRPrimaryFractionWithRangeTest(systemtesting.MantidSystemTest):
scaling_factor = None
def runTest(self):
@@ -47,7 +47,7 @@ class LRPrimaryFractionWithRangeTest(stresstesting.MantidStressTest):
return True
-class ApplyToReducedDataTest(stresstesting.MantidStressTest):
+class ApplyToReducedDataTest(systemtesting.MantidSystemTest):
def runTest(self):
#TODO: The reduction algorithm should not require an absolute path
scaling_factor_file = FileFinder.getFullPath("directBeamDatabaseFall2014_IPTS_11601_2.cfg")
diff --git a/Testing/SystemTests/tests/analysis/LRScalingFactorsTest.py b/Testing/SystemTests/tests/analysis/LRScalingFactorsTest.py
index 84180596e0f140f6203ccba1b2607496d9938b53..7491139d4dab5ab7a1b69c3329788ba2c294836b 100644
--- a/Testing/SystemTests/tests/analysis/LRScalingFactorsTest.py
+++ b/Testing/SystemTests/tests/analysis/LRScalingFactorsTest.py
@@ -5,13 +5,13 @@
# & Institut Laue - Langevin
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init,attribute-defined-outside-init
-import stresstesting
+import systemtesting
import os
from mantid import *
from mantid.simpleapi import *
-class LRPrimaryFractionTest(stresstesting.MantidStressTest):
+class LRPrimaryFractionTest(systemtesting.MantidSystemTest):
"""
#y=a+bx
#
diff --git a/Testing/SystemTests/tests/analysis/LiquidsReflectometryReductionTest.py b/Testing/SystemTests/tests/analysis/LiquidsReflectometryReductionTest.py
index 38872e18aaaa3270dcfae5d598a8ec33e591e048..f5eb6ddfc90ba559c11eded9f845bf09372e8867 100644
--- a/Testing/SystemTests/tests/analysis/LiquidsReflectometryReductionTest.py
+++ b/Testing/SystemTests/tests/analysis/LiquidsReflectometryReductionTest.py
@@ -6,7 +6,7 @@
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init,attribute-defined-outside-init
import os
-import stresstesting
+import systemtesting
from mantid import *
from mantid.simpleapi import *
@@ -22,7 +22,7 @@ def get_file_path(filename):
return alg.getProperty('OutputFilename').value
-class LiquidsReflectometryReductionTest(stresstesting.MantidStressTest):
+class LiquidsReflectometryReductionTest(systemtesting.MantidSystemTest):
def runTest(self):
scaling_factor_file = FileFinder.getFullPath("directBeamDatabaseFall2014_IPTS_11601_2.cfg")
@@ -59,7 +59,7 @@ class LiquidsReflectometryReductionTest(stresstesting.MantidStressTest):
return "reflectivity_119814", 'REFL_119814_combined_data_v2.nxs'
-class LRReflectivityOutputTest(stresstesting.MantidStressTest):
+class LRReflectivityOutputTest(systemtesting.MantidSystemTest):
"""
Test the reflectivity output algorithm
"""
diff --git a/Testing/SystemTests/tests/analysis/LiquidsReflectometryReductionWithBackgroundTest.py b/Testing/SystemTests/tests/analysis/LiquidsReflectometryReductionWithBackgroundTest.py
index 93260eff50adb3e9b7dd474728c4a9c3df490ff1..aa4e590e45e14535f113b18a0335d19485175830 100644
--- a/Testing/SystemTests/tests/analysis/LiquidsReflectometryReductionWithBackgroundTest.py
+++ b/Testing/SystemTests/tests/analysis/LiquidsReflectometryReductionWithBackgroundTest.py
@@ -5,12 +5,12 @@
# & Institut Laue - Langevin
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init
-import stresstesting
+import systemtesting
from mantid import *
from mantid.simpleapi import *
-class LiquidsReflectometryReductionWithBackgroundPreciseTest(stresstesting.MantidStressTest):
+class LiquidsReflectometryReductionWithBackgroundPreciseTest(systemtesting.MantidSystemTest):
"""
This test checks that the new liquids reflectometer reduction code
always produces the same results.
@@ -53,7 +53,7 @@ class LiquidsReflectometryReductionWithBackgroundPreciseTest(stresstesting.Manti
return "reflectivity_precise_119816", 'LiquidsReflectometryReductionTestWithBackground.nxs'
-class NoNormalizationTest(stresstesting.MantidStressTest):
+class NoNormalizationTest(systemtesting.MantidSystemTest):
def runTest(self):
#TODO: The reduction algorithm should not require an absolute path
scaling_factor_file = FileFinder.getFullPath("directBeamDatabaseFall2014_IPTS_11601_2.cfg")
@@ -91,7 +91,7 @@ class NoNormalizationTest(stresstesting.MantidStressTest):
return "reflectivity_119816", 'REFL_NoNormalizationTest.nxs'
-class TOFRangeOFFTest(stresstesting.MantidStressTest):
+class TOFRangeOFFTest(systemtesting.MantidSystemTest):
def runTest(self):
#TODO: The reduction algorithm should not require an absolute path
scaling_factor_file = FileFinder.getFullPath("directBeamDatabaseFall2014_IPTS_11601_2.cfg")
@@ -130,7 +130,7 @@ class TOFRangeOFFTest(stresstesting.MantidStressTest):
return "reflectivity_119816", 'TOFRangeOFFTest.nxs'
-class NoBackgroundTest(stresstesting.MantidStressTest):
+class NoBackgroundTest(systemtesting.MantidSystemTest):
def runTest(self):
#TODO: The reduction algorithm should not require an absolute path
scaling_factor_file = FileFinder.getFullPath("directBeamDatabaseFall2014_IPTS_11601_2.cfg")
@@ -169,7 +169,7 @@ class NoBackgroundTest(stresstesting.MantidStressTest):
return "reflectivity_119816", 'REFL_NoBackgroundTest.nxs'
-class TOFMismatchTest(stresstesting.MantidStressTest):
+class TOFMismatchTest(systemtesting.MantidSystemTest):
correct_exception_caught = False
def runTest(self):
@@ -210,7 +210,7 @@ class TOFMismatchTest(stresstesting.MantidStressTest):
return self.correct_exception_caught
-class BadDataTOFRangeTest(stresstesting.MantidStressTest):
+class BadDataTOFRangeTest(systemtesting.MantidSystemTest):
correct_exception_caught = False
def runTest(self):
@@ -251,7 +251,7 @@ class BadDataTOFRangeTest(stresstesting.MantidStressTest):
return self.correct_exception_caught
-class BadPeakSelectionTest(stresstesting.MantidStressTest):
+class BadPeakSelectionTest(systemtesting.MantidSystemTest):
correct_exception_caught = False
def runTest(self):
diff --git a/Testing/SystemTests/tests/analysis/LoadAndCheckBase.py b/Testing/SystemTests/tests/analysis/LoadAndCheckBase.py
index 8b18b465e737b542733fe120053e52b40f5b9d87..3ec075161046307c81470856db1f0f07724c5ea4 100644
--- a/Testing/SystemTests/tests/analysis/LoadAndCheckBase.py
+++ b/Testing/SystemTests/tests/analysis/LoadAndCheckBase.py
@@ -10,7 +10,7 @@ These system tests are to verify the behaviour of the ISIS reflectometry reducti
"""
from __future__ import (absolute_import, division, print_function)
-import stresstesting
+import systemtesting
from mantid.simpleapi import *
import mantid.api
@@ -18,7 +18,7 @@ from abc import ABCMeta, abstractmethod
from six import with_metaclass
-class LoadAndCheckBase(with_metaclass(ABCMeta, stresstesting.MantidStressTest)):
+class LoadAndCheckBase(with_metaclass(ABCMeta, systemtesting.MantidSystemTest)):
__comparison_out_workspace_name = 'a_integrated'
diff --git a/Testing/SystemTests/tests/analysis/LoadEmbeddedInstrumentInfo.py b/Testing/SystemTests/tests/analysis/LoadEmbeddedInstrumentInfo.py
index 4ce05a23c6fa1eab4bd4da4f392f69cadf5a17e5..337db9d87ca0aa1015e6a2efe7f61a6814eb1b55 100644
--- a/Testing/SystemTests/tests/analysis/LoadEmbeddedInstrumentInfo.py
+++ b/Testing/SystemTests/tests/analysis/LoadEmbeddedInstrumentInfo.py
@@ -5,7 +5,7 @@
# & Institut Laue - Langevin
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init
-import stresstesting
+import systemtesting
from mantid.simpleapi import *
#
@@ -20,7 +20,7 @@ from mantid.simpleapi import *
# completely wrong location of (0,3,0)
-class ISISRawHistNexus(stresstesting.MantidStressTest):
+class ISISRawHistNexus(systemtesting.MantidSystemTest):
def runTest(self):
# ISIS raw hist nexus file with A1_window at location (0,3,0)
diff --git a/Testing/SystemTests/tests/analysis/LoadExedTest.py b/Testing/SystemTests/tests/analysis/LoadExedTest.py
index f60ceb224e1f13eaa5b6b8e1f268039ea70b08bb..1b10fdfa7623419fa53870f2212f7ff004c265cf 100644
--- a/Testing/SystemTests/tests/analysis/LoadExedTest.py
+++ b/Testing/SystemTests/tests/analysis/LoadExedTest.py
@@ -6,12 +6,12 @@
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=invalid-name,no-init,too-many-public-methods,too-many-arguments
from __future__ import (absolute_import, division, print_function)
-import stresstesting
+import systemtesting
import mantid.simpleapi as ms
-class LoadExedTest(stresstesting.MantidStressTest):
+class LoadExedTest(systemtesting.MantidSystemTest):
def runTest(self):
rawfile = "V15_0000016544_S000_P01.raw"
print("Rawfilename:"+rawfile)
diff --git a/Testing/SystemTests/tests/analysis/LoadLotsOfFiles.py b/Testing/SystemTests/tests/analysis/LoadLotsOfFiles.py
index bce4dfae023f81c23e368835206345efe54c871e..9ab6f9c5049ba37f0f1ea61e52b7508be34e63e0 100644
--- a/Testing/SystemTests/tests/analysis/LoadLotsOfFiles.py
+++ b/Testing/SystemTests/tests/analysis/LoadLotsOfFiles.py
@@ -10,7 +10,7 @@ from mantid.simpleapi import config, Load
from mantid.api import FrameworkManager
import os
import re
-import stresstesting
+import systemtesting
BANNED_FILES = ['80_tubes_Top_and_Bottom_April_2015.xml',
'80_tubes_Top_and_Bottom_May_2016.xml',
@@ -183,7 +183,7 @@ def useFile(direc, filename):
return True, filename
-class LoadLotsOfFiles(stresstesting.MantidStressTest):
+class LoadLotsOfFiles(systemtesting.MantidSystemTest):
def __getDataFileList__(self):
# get a list of directories to look in
dirs = config['datasearch.directories'].split(';')
diff --git a/Testing/SystemTests/tests/analysis/LoadLotsOfInstruments.py b/Testing/SystemTests/tests/analysis/LoadLotsOfInstruments.py
index c1dcc1084a198a9210d7f73edc87df9cbaf8a010..271237adffa1af8e276f6cfded08aaae0d84df60 100644
--- a/Testing/SystemTests/tests/analysis/LoadLotsOfInstruments.py
+++ b/Testing/SystemTests/tests/analysis/LoadLotsOfInstruments.py
@@ -10,12 +10,12 @@ from mantid.simpleapi import *
from mantid.api import FrameworkManager
import os
import glob
-import stresstesting
+import systemtesting
EXPECTED_EXT = '.expected'
-class LoadLotsOfInstruments(stresstesting.MantidStressTest):
+class LoadLotsOfInstruments(systemtesting.MantidSystemTest):
def __getDataFileList__(self):
# get a list of directories to look in
direc = config['instrumentDefinition.directory']
diff --git a/Testing/SystemTests/tests/analysis/LoadMuonNexusTest.py b/Testing/SystemTests/tests/analysis/LoadMuonNexusTest.py
index e95c5be8c217a15a7650727ed1eea9101ce878ba..3d7d4debba280fb9189c280a50f0519f40205232 100644
--- a/Testing/SystemTests/tests/analysis/LoadMuonNexusTest.py
+++ b/Testing/SystemTests/tests/analysis/LoadMuonNexusTest.py
@@ -5,11 +5,11 @@
# & Institut Laue - Langevin
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init
-import stresstesting
+import systemtesting
from mantid.simpleapi import *
-class LoadMuonNexusTest(stresstesting.MantidStressTest):
+class LoadMuonNexusTest(systemtesting.MantidSystemTest):
def runTest(self):
# EMU03087 is an old data file produced by CONVERT_NEXUS from MCS binary files.
diff --git a/Testing/SystemTests/tests/analysis/LoadTest.py b/Testing/SystemTests/tests/analysis/LoadTest.py
index c71e10bc0d86196dfceb5ff18d397d3993aac8c3..71e6e476c4da42a80ea3cde74ae491aac6aa3640 100644
--- a/Testing/SystemTests/tests/analysis/LoadTest.py
+++ b/Testing/SystemTests/tests/analysis/LoadTest.py
@@ -10,7 +10,7 @@
test to encompass the complex multi-file loading that the Load
algorithm is capable of.
"""
-import stresstesting
+import systemtesting
from mantid.api import AnalysisDataService, IEventWorkspace, MatrixWorkspace, WorkspaceGroup
from mantid.simpleapi import Load
@@ -20,7 +20,7 @@ import unittest
DIFF_PLACES = 8
-class LoadTest(stresstesting.MantidStressTest):
+class LoadTest(systemtesting.MantidSystemTest):
_success = False
diff --git a/Testing/SystemTests/tests/analysis/LoadVesuvioTest.py b/Testing/SystemTests/tests/analysis/LoadVesuvioTest.py
index 19757a2632a0b979908f35bb7a51bd846da24272..ebae5dd90c5709614169439b91cfed5e288b0790 100644
--- a/Testing/SystemTests/tests/analysis/LoadVesuvioTest.py
+++ b/Testing/SystemTests/tests/analysis/LoadVesuvioTest.py
@@ -6,7 +6,7 @@
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=invalid-name,no-init,too-many-public-methods,too-many-arguments
from __future__ import (absolute_import, division, print_function)
-import stresstesting
+import systemtesting
from mantid.api import FileFinder, MatrixWorkspace, mtd
import mantid.simpleapi as ms
@@ -436,7 +436,7 @@ class VesuvioTests(unittest.TestCase):
#====================================================================================
-class LoadVesuvioTest(stresstesting.MantidStressTest):
+class LoadVesuvioTest(systemtesting.MantidSystemTest):
_success = False
diff --git a/Testing/SystemTests/tests/analysis/MDWorkspaceTests.py b/Testing/SystemTests/tests/analysis/MDWorkspaceTests.py
index 6393c20e9541e6716d98eb7b5224e583889679ca..5402d0138c25b81021a8a25932457ba9a73ee72a 100644
--- a/Testing/SystemTests/tests/analysis/MDWorkspaceTests.py
+++ b/Testing/SystemTests/tests/analysis/MDWorkspaceTests.py
@@ -11,7 +11,7 @@ file-backed MDWorkspaces.
"""
from __future__ import (absolute_import, division, print_function)
-import stresstesting
+import systemtesting
import os
from mantid.simpleapi import *
from mantid.api import *
@@ -21,7 +21,7 @@ from six.moves import range
###############################################################################
-class PlusMDTest(stresstesting.MantidStressTest):
+class PlusMDTest(systemtesting.MantidSystemTest):
_saved_filename = None
original_binned = None
@@ -140,7 +140,7 @@ class PlusMDTest(stresstesting.MantidStressTest):
###############################################################################
-class MergeMDTest(stresstesting.MantidStressTest):
+class MergeMDTest(systemtesting.MantidSystemTest):
_saved_filenames = []
diff --git a/Testing/SystemTests/tests/analysis/MagnetismReflectometryReductionTest.py b/Testing/SystemTests/tests/analysis/MagnetismReflectometryReductionTest.py
index b39174432c19781829b194b5f5bd12aaed6558bd..041c7b90bb20938d07352d29bcd6fbfb7b02e188 100644
--- a/Testing/SystemTests/tests/analysis/MagnetismReflectometryReductionTest.py
+++ b/Testing/SystemTests/tests/analysis/MagnetismReflectometryReductionTest.py
@@ -5,13 +5,13 @@
# & Institut Laue - Langevin
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init,attribute-defined-outside-init
-import stresstesting
+import systemtesting
from mantid import *
from mantid.simpleapi import *
import math
-class MagnetismReflectometryReductionTest(stresstesting.MantidStressTest):
+class MagnetismReflectometryReductionTest(systemtesting.MantidSystemTest):
def runTest(self):
wsg = MRFilterCrossSections(Filename="REF_M_24949")
MagnetismReflectometryReduction(InputWorkspace=wsg[0],
@@ -47,7 +47,7 @@ class MagnetismReflectometryReductionTest(stresstesting.MantidStressTest):
return "r_24949", 'MagnetismReflectometryReductionTest.nxs'
-class MagnetismReflectometryReductionConstQTest(stresstesting.MantidStressTest):
+class MagnetismReflectometryReductionConstQTest(systemtesting.MantidSystemTest):
def runTest(self):
wsg = MRFilterCrossSections(Filename="REF_M_24949")
MagnetismReflectometryReduction(InputWorkspace=wsg[0],
@@ -78,7 +78,7 @@ class MagnetismReflectometryReductionConstQTest(stresstesting.MantidStressTest):
return math.fabs(refl[1] - 0.648596877775159) < 0.002
-class MagnetismReflectometryReductionConstQWLCutTest(stresstesting.MantidStressTest):
+class MagnetismReflectometryReductionConstQWLCutTest(systemtesting.MantidSystemTest):
def runTest(self):
wsg = MRFilterCrossSections(Filename="REF_M_24949")
MagnetismReflectometryReduction(InputWorkspace=wsg[0],
@@ -109,7 +109,7 @@ class MagnetismReflectometryReductionConstQWLCutTest(stresstesting.MantidStressT
return math.fabs(refl[1] - 0.648596877775159) < 0.002
-class MRFilterCrossSectionsTest(stresstesting.MantidStressTest):
+class MRFilterCrossSectionsTest(systemtesting.MantidSystemTest):
""" Test data loading and cross-section extraction """
def runTest(self):
wsg = MRFilterCrossSections(Filename="REF_M_24949")
@@ -146,7 +146,7 @@ class MRFilterCrossSectionsTest(stresstesting.MantidStressTest):
return "r_24949", 'MagnetismReflectometryReductionTest.nxs'
-class MRFilterCrossSectionsWithWorkspaceTest(stresstesting.MantidStressTest):
+class MRFilterCrossSectionsWithWorkspaceTest(systemtesting.MantidSystemTest):
""" Test data loading and cross-section extraction """
def runTest(self):
ws_input = LoadEventNexus(Filename="REF_M_24949",
@@ -196,7 +196,7 @@ class MRFilterCrossSectionsWithWorkspaceTest(stresstesting.MantidStressTest):
return "r_24949", 'MagnetismReflectometryReductionTest.nxs'
-class MRNormaWorkspaceTest(stresstesting.MantidStressTest):
+class MRNormaWorkspaceTest(systemtesting.MantidSystemTest):
""" Test data loading and cross-section extraction """
def runTest(self):
wsg = MRFilterCrossSections(Filename="REF_M_24949")
@@ -236,7 +236,7 @@ class MRNormaWorkspaceTest(stresstesting.MantidStressTest):
return "r_24949", 'MagnetismReflectometryReductionTest.nxs'
-class MRDIRPIXTest(stresstesting.MantidStressTest):
+class MRDIRPIXTest(systemtesting.MantidSystemTest):
""" Test data loading and cross-section extraction """
def runTest(self):
wsg = MRFilterCrossSections(Filename="REF_M_24949")
@@ -282,7 +282,7 @@ class MRDIRPIXTest(stresstesting.MantidStressTest):
return "r_24949", 'MagnetismReflectometryReductionTest.nxs'
-class MRDANGLE0Test(stresstesting.MantidStressTest):
+class MRDANGLE0Test(systemtesting.MantidSystemTest):
""" Test data loading and cross-section extraction """
def runTest(self):
wsg = MRFilterCrossSections(Filename="REF_M_24949")
@@ -328,7 +328,7 @@ class MRDANGLE0Test(stresstesting.MantidStressTest):
return "r_24949", 'MagnetismReflectometryReductionTest.nxs'
-class MROutputTest(stresstesting.MantidStressTest):
+class MROutputTest(systemtesting.MantidSystemTest):
""" Test the MR output algorithm """
def runTest(self):
wsg = MRFilterCrossSections(Filename="REF_M_24949")
@@ -368,7 +368,7 @@ class MROutputTest(stresstesting.MantidStressTest):
return "r_24949", 'MagnetismReflectometryReductionTest.nxs'
-class MRInspectionTest(stresstesting.MantidStressTest):
+class MRInspectionTest(systemtesting.MantidSystemTest):
def runTest(self):
nxs_data = LoadEventNexus(Filename="REF_M_24949",
NXentryName="entry-Off_Off",
@@ -380,7 +380,7 @@ class MRInspectionTest(stresstesting.MantidStressTest):
return mtd["r_24949"].getRun().getProperty("is_direct_beam").value == "False"
-class MRInspectionOverwritesTest(stresstesting.MantidStressTest):
+class MRInspectionOverwritesTest(systemtesting.MantidSystemTest):
def runTest(self):
nxs_data = LoadEventNexus(Filename="REF_M_24949",
NXentryName="entry-Off_Off",
@@ -392,7 +392,7 @@ class MRInspectionOverwritesTest(stresstesting.MantidStressTest):
return mtd["r_24949"].getRun().getProperty("is_direct_beam").value == "False"
-class MRGetThetaTest(stresstesting.MantidStressTest):
+class MRGetThetaTest(systemtesting.MantidSystemTest):
""" Test that the MRGetTheta algorithm produces correct results """
def runTest(self):
nxs_data = LoadEventNexus(Filename="REF_M_24949",
diff --git a/Testing/SystemTests/tests/analysis/MaxEntTest.py b/Testing/SystemTests/tests/analysis/MaxEntTest.py
index 3bc46911a407b56a406d5a4cc0571e9fbeb751b4..104af169306c16042eb576acd7cfff4e87da0928 100644
--- a/Testing/SystemTests/tests/analysis/MaxEntTest.py
+++ b/Testing/SystemTests/tests/analysis/MaxEntTest.py
@@ -5,11 +5,11 @@
# & Institut Laue - Langevin
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init,attribute-defined-outside-init
-import stresstesting
+import systemtesting
from mantid.simpleapi import *
-class MaxEntTest(stresstesting.MantidStressTest):
+class MaxEntTest(systemtesting.MantidSystemTest):
'''Tests the MaxEnt algorithm on a MUSR workspace'''
def runTest(self):
diff --git a/Testing/SystemTests/tests/analysis/MuonFFTTest.py b/Testing/SystemTests/tests/analysis/MuonFFTTest.py
index dd0e642be0841f3b2fd31eb5d61fa8c839efd793..da3de886f66d23d82d3f6aab89e6977a39dcbebe 100644
--- a/Testing/SystemTests/tests/analysis/MuonFFTTest.py
+++ b/Testing/SystemTests/tests/analysis/MuonFFTTest.py
@@ -5,12 +5,12 @@
# & Institut Laue - Langevin
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init,attribute-defined-outside-init
-import stresstesting
+import systemtesting
from mantid.simpleapi import *
from math import pi
-class MuonFFTTest(stresstesting.MantidStressTest):
+class MuonFFTTest(systemtesting.MantidSystemTest):
'''Tests the FFT algorithm on a MUSR workspace, to check it can cope with rounding errors in X'''
def runTest(self):
diff --git a/Testing/SystemTests/tests/analysis/MuonKerenFittingTest.py b/Testing/SystemTests/tests/analysis/MuonKerenFittingTest.py
index 7ebe175dbbfdf067432081d7ee9604fc50c3d484..354a701a07e6c0731990eace1eae2c5fd1e58caf 100644
--- a/Testing/SystemTests/tests/analysis/MuonKerenFittingTest.py
+++ b/Testing/SystemTests/tests/analysis/MuonKerenFittingTest.py
@@ -5,11 +5,11 @@
# & Institut Laue - Langevin
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init,attribute-defined-outside-init,too-few-public-methods
-import stresstesting
+import systemtesting
from mantid.simpleapi import *
-class MuonKerenFittingTest(stresstesting.MantidStressTest):
+class MuonKerenFittingTest(systemtesting.MantidSystemTest):
'''Tests the Keren fitting function on a real workspace, to check results vs. WiMDA'''
def runTest(self):
diff --git a/Testing/SystemTests/tests/analysis/MuonMaxEntTest.py b/Testing/SystemTests/tests/analysis/MuonMaxEntTest.py
index cf9c84b9b968d5697132d5cdaa59e33dea2fa980..8f2b3d556d0f0bf2c7be024dc767fe22ea4c3e92 100644
--- a/Testing/SystemTests/tests/analysis/MuonMaxEntTest.py
+++ b/Testing/SystemTests/tests/analysis/MuonMaxEntTest.py
@@ -5,12 +5,12 @@
# & Institut Laue - Langevin
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=no-init,attribute-defined-outside-init
-import stresstesting
+import systemtesting
from math import pi
from mantid.simpleapi import *
-class MuonMaxEntTest(stresstesting.MantidStressTest):
+class MuonMaxEntTest(systemtesting.MantidSystemTest):
'''Tests the MaxEnt algorithm on a MUSR workspace'''
diff --git a/Testing/SystemTests/tests/analysis/MuonProcessTest.py b/Testing/SystemTests/tests/analysis/MuonProcessTest.py
index 24825c828fd36c7e53cced22a282c358dcc9e665..45d5be8b1510d277f420829dd02b906e861e0009 100644
--- a/Testing/SystemTests/tests/analysis/MuonProcessTest.py
+++ b/Testing/SystemTests/tests/analysis/MuonProcessTest.py
@@ -5,11 +5,11 @@
# & Institut Laue - Langevin
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init
-import stresstesting
+import systemtesting
from mantid.simpleapi import *
-class MuonProcessTest(stresstesting.MantidStressTest):
+class MuonProcessTest(systemtesting.MantidSystemTest):
def runTest(self):
# Create custom grouping
diff --git a/Testing/SystemTests/tests/analysis/POLDIAnalyseResidualsTest.py b/Testing/SystemTests/tests/analysis/POLDIAnalyseResidualsTest.py
index 6fca053c752749a9857e5eb35b6935142fafa76b..36ee1e08f4b87b2fdd7f6df60da83d327cd31744 100644
--- a/Testing/SystemTests/tests/analysis/POLDIAnalyseResidualsTest.py
+++ b/Testing/SystemTests/tests/analysis/POLDIAnalyseResidualsTest.py
@@ -5,12 +5,12 @@
# & Institut Laue - Langevin
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init
-import stresstesting
+import systemtesting
from mantid.simpleapi import *
import numpy as np
-class POLDIAnalyseResidualsTest(stresstesting.MantidStressTest):
+class POLDIAnalyseResidualsTest(systemtesting.MantidSystemTest):
'''This test checks that the residual analysis algorithm for POLDI works correctly.'''
def runTest(self):
diff --git a/Testing/SystemTests/tests/analysis/POLDIAutoCorrelationTest.py b/Testing/SystemTests/tests/analysis/POLDIAutoCorrelationTest.py
index 0e78ae16e6a1daacee30c2ccd6fceab7e300f41e..60dd463bfed7a6efa903764bc4ea49a4f42fd070 100644
--- a/Testing/SystemTests/tests/analysis/POLDIAutoCorrelationTest.py
+++ b/Testing/SystemTests/tests/analysis/POLDIAutoCorrelationTest.py
@@ -5,12 +5,12 @@
# & Institut Laue - Langevin
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init
-import stresstesting
+import systemtesting
from mantid.simpleapi import *
import numpy as np
-class POLDIAutoCorrelationTest(stresstesting.MantidStressTest):
+class POLDIAutoCorrelationTest(systemtesting.MantidSystemTest):
'''This test checks that the results of PoldiAutoCorrelation match the expected outcome.'''
def runTest(self):
diff --git a/Testing/SystemTests/tests/analysis/POLDICreatePeaksFromCellTest.py b/Testing/SystemTests/tests/analysis/POLDICreatePeaksFromCellTest.py
index 9162b31219ef69c86bebf8a046ada7695fb415a9..88b0c73382a9431b1756c1febc0fc3fc08951e13 100644
--- a/Testing/SystemTests/tests/analysis/POLDICreatePeaksFromCellTest.py
+++ b/Testing/SystemTests/tests/analysis/POLDICreatePeaksFromCellTest.py
@@ -6,7 +6,7 @@
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=no-init,invalid-name,too-many-locals,too-few-public-methods
from __future__ import (absolute_import, division, print_function)
-import stresstesting
+import systemtesting
from mantid.simpleapi import *
# These tests check the correctness of the structure factor calculation for some common crystal structures.
@@ -24,7 +24,7 @@ from mantid.simpleapi import *
# Isotropic thermal parameters are rounded or arbitrary (the tests are meant for checking the calculations only).
-class ReflectionCheckingTest(stresstesting.MantidStressTest):
+class ReflectionCheckingTest(systemtesting.MantidSystemTest):
def runTest(self):
pass
diff --git a/Testing/SystemTests/tests/analysis/POLDIDataAnalysisTest.py b/Testing/SystemTests/tests/analysis/POLDIDataAnalysisTest.py
index df48387b9c5895a853a869f520d68d447419681a..5f4e6073fc772804f52dbef679003c4a35c37655 100644
--- a/Testing/SystemTests/tests/analysis/POLDIDataAnalysisTest.py
+++ b/Testing/SystemTests/tests/analysis/POLDIDataAnalysisTest.py
@@ -5,13 +5,13 @@
# & Institut Laue - Langevin
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=no-init,invalid-name,too-many-locals,too-few-public-methods
-import stresstesting
+import systemtesting
from mantid.simpleapi import *
from mantid.api import *
import numpy as np
-class POLDIDataAnalysisTestSi(stresstesting.MantidStressTest):
+class POLDIDataAnalysisTestSi(systemtesting.MantidSystemTest):
"""Base class that loads/generates data for the tests, which is identical.
"""
@@ -165,7 +165,7 @@ class POLDIDataAnalysisTestSiPawley(POLDIDataAnalysisTestSi):
self.assertLessThan(np.abs(a_val - 5.4311946) / a_err, 1.5)
-class POLDIDataAnalysisEmptyFile(stresstesting.MantidStressTest):
+class POLDIDataAnalysisEmptyFile(systemtesting.MantidSystemTest):
"""This test runs PoldiDataAnalysis with Si data, using an empty workspace."""
def runTest(self):
diff --git a/Testing/SystemTests/tests/analysis/POLDIFitPeaks1DTest.py b/Testing/SystemTests/tests/analysis/POLDIFitPeaks1DTest.py
index 3373d7d2785886c640b7cc431adc97a70ffefb13..a7d0bf7ddf69d719581cdca515270928a39ed34c 100644
--- a/Testing/SystemTests/tests/analysis/POLDIFitPeaks1DTest.py
+++ b/Testing/SystemTests/tests/analysis/POLDIFitPeaks1DTest.py
@@ -6,12 +6,12 @@
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init
from __future__ import (absolute_import, division, print_function)
-import stresstesting
+import systemtesting
from mantid.simpleapi import *
import numpy as np
-class POLDIFitPeaks1DTest(stresstesting.MantidStressTest):
+class POLDIFitPeaks1DTest(systemtesting.MantidSystemTest):
'''Checking results of PoldiFitPeaks1D.'''
# The errors of fitted parameters in version 2 are a bit small
diff --git a/Testing/SystemTests/tests/analysis/POLDIFitPeaks2DTest.py b/Testing/SystemTests/tests/analysis/POLDIFitPeaks2DTest.py
index 6159c6c2b684a6f185e32489ca95c7154b67fdcc..b1609ed8712e1da022fb09d1e6c902a82c850a5e 100644
--- a/Testing/SystemTests/tests/analysis/POLDIFitPeaks2DTest.py
+++ b/Testing/SystemTests/tests/analysis/POLDIFitPeaks2DTest.py
@@ -6,12 +6,12 @@
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=no-init,invalid-name,too-many-locals,too-few-public-methods
from __future__ import (absolute_import, division, print_function)
-import stresstesting
+import systemtesting
from mantid.simpleapi import *
import numpy as np
-class POLDIFitPeaks2DTest(stresstesting.MantidStressTest):
+class POLDIFitPeaks2DTest(systemtesting.MantidSystemTest):
"""The system test currently checks that the calculation of 2D spectra
works correctly."""
@@ -95,7 +95,7 @@ class POLDIFitPeaks2DTest(stresstesting.MantidStressTest):
self.assertLessThan(maxDifference, 0.07)
-class POLDIFitPeaks2DPawleyTest(stresstesting.MantidStressTest):
+class POLDIFitPeaks2DPawleyTest(systemtesting.MantidSystemTest):
def runTest(self):
si = PoldiLoadRuns(2013, 6903, 6904, 2)
corr = PoldiAutoCorrelation('si_data_6904')
@@ -129,7 +129,7 @@ class POLDIFitPeaks2DPawleyTest(stresstesting.MantidStressTest):
DeleteWorkspace(peaks_ref_2d)
-class POLDIFitPeaks2DIntegratedIntensities(stresstesting.MantidStressTest):
+class POLDIFitPeaks2DIntegratedIntensities(systemtesting.MantidSystemTest):
def runTest(self):
si = PoldiLoadRuns(2013, 6903, 6904, 2)
corr = PoldiAutoCorrelation('si_data_6904')
diff --git a/Testing/SystemTests/tests/analysis/POLDILoadRunsTest.py b/Testing/SystemTests/tests/analysis/POLDILoadRunsTest.py
index db97383bd3a394f99bd8a1fd58b3bb9b638ad780..7c2ee0e33404a6c0ef90cdb92a1e372e5ee9d33a 100644
--- a/Testing/SystemTests/tests/analysis/POLDILoadRunsTest.py
+++ b/Testing/SystemTests/tests/analysis/POLDILoadRunsTest.py
@@ -5,13 +5,13 @@
# & Institut Laue - Langevin
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=no-init,invalid-name,bare-except
-import stresstesting
+import systemtesting
from mantid.simpleapi import *
from mantid.api import *
import numpy as np
-class POLDILoadRunsTest(stresstesting.MantidStressTest):
+class POLDILoadRunsTest(systemtesting.MantidSystemTest):
"""This assembly of test cases checks that the behavior of PoldiLoadRuns is correct."""
def runTest(self):
diff --git a/Testing/SystemTests/tests/analysis/POLDIMergeTest.py b/Testing/SystemTests/tests/analysis/POLDIMergeTest.py
index fed4f6dd2e7396ab40a49bbc9d5b8d9eda5b8aaa..123fa5b962bec1b072df6cdd688f671230bcc6f8 100644
--- a/Testing/SystemTests/tests/analysis/POLDIMergeTest.py
+++ b/Testing/SystemTests/tests/analysis/POLDIMergeTest.py
@@ -5,12 +5,12 @@
# & Institut Laue - Langevin
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init
-import stresstesting
+import systemtesting
from mantid.simpleapi import *
import numpy as np
-class POLDIMergeTest(stresstesting.MantidStressTest):
+class POLDIMergeTest(systemtesting.MantidSystemTest):
'''This test checks that the results of PoldiMerge match the expected outcome.'''
def runTest(self):
diff --git a/Testing/SystemTests/tests/analysis/POLDIPeakSearchTest.py b/Testing/SystemTests/tests/analysis/POLDIPeakSearchTest.py
index 39c2d997540be625f579c5857b448da6b25baac0..a078e9c9d79061fe8dffef529a77228af7d591bb 100644
--- a/Testing/SystemTests/tests/analysis/POLDIPeakSearchTest.py
+++ b/Testing/SystemTests/tests/analysis/POLDIPeakSearchTest.py
@@ -5,12 +5,12 @@
# & Institut Laue - Langevin
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init
-import stresstesting
+import systemtesting
from mantid.simpleapi import *
import numpy as np
-class POLDIPeakSearchTest(stresstesting.MantidStressTest):
+class POLDIPeakSearchTest(systemtesting.MantidSystemTest):
'''This test checks that the results of PoldiAutoCorrelation match the expected outcome.'''
def runTest(self):
diff --git a/Testing/SystemTests/tests/analysis/POLDITruncateDataTest.py b/Testing/SystemTests/tests/analysis/POLDITruncateDataTest.py
index 316e05276b0154bfd245a09ee8d995b8b3de7030..8f84cb97ac79d5837951724d47f4c8f5dd51e241 100644
--- a/Testing/SystemTests/tests/analysis/POLDITruncateDataTest.py
+++ b/Testing/SystemTests/tests/analysis/POLDITruncateDataTest.py
@@ -5,11 +5,11 @@
# & Institut Laue - Langevin
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init,invalid-name
-import stresstesting
+import systemtesting
from mantid.simpleapi import *
-class POLDITruncateDataTest(stresstesting.MantidStressTest):
+class POLDITruncateDataTest(systemtesting.MantidSystemTest):
""" This test checks that the results of PoldiAutoCorrelation match the expected outcome."""
dataFileName = None
diff --git a/Testing/SystemTests/tests/analysis/PVPythonTest.py b/Testing/SystemTests/tests/analysis/PVPythonTest.py
index d499d5c3ee117b52bcf5f02d53f9333c959be74c..0b56b13a44cea5c7913a5f0536931436bd86214a 100644
--- a/Testing/SystemTests/tests/analysis/PVPythonTest.py
+++ b/Testing/SystemTests/tests/analysis/PVPythonTest.py
@@ -5,11 +5,11 @@
# & Institut Laue - Langevin
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=W0232,R0903
-import stresstesting
+import systemtesting
from paraview.simple import *
-class PVPythonTest(stresstesting.MantidStressTest):
+class PVPythonTest(systemtesting.MantidSystemTest):
def runTest(self):
self.assertEqual(GetParaViewVersion().major, 5)
diff --git a/Testing/SystemTests/tests/analysis/Peak2ConvCell_Test.py b/Testing/SystemTests/tests/analysis/Peak2ConvCell_Test.py
index c7123e2eec28c8bb9388adfae0e2c463bce1c9ce..16268d7689e129cb519363920d4a11ddbdd37cbc 100644
--- a/Testing/SystemTests/tests/analysis/Peak2ConvCell_Test.py
+++ b/Testing/SystemTests/tests/analysis/Peak2ConvCell_Test.py
@@ -14,7 +14,7 @@
# !!!!!!!!! REPLACE THE "XXX" OR else !!!!!!!!!!
-# import stresstesting
+# import systemtesting
from __future__ import (absolute_import, division, print_function)
import numpy
from numpy import matrix
@@ -28,7 +28,7 @@ from mantid.simpleapi import *
# TODO premultiply cases, fix up.. Maybe not needed Cause Conv cell was "Nigglied"
# TODO: SWitch cases, if use approx inequality, may get error cause low level code
# [does Not](does) premult but when it [should](should not)
-class Peak2ConvCell_Test(object): # (stresstesting.MantidStressTest):
+class Peak2ConvCell_Test(object): # (systemtesting.MantidSystemTest):
conventionalUB = numpy.zeros(shape=(3, 3))
Cubic = [1, 3, 5]
Tetr = [6, 7, 11, 15, 18, 21]
diff --git a/Testing/SystemTests/tests/analysis/PolrefExample.py b/Testing/SystemTests/tests/analysis/PolrefExample.py
index 51a3ecb6031651328025ddf8f1b57f63327c056a..ed593a2c1ddb604f8dde85d1865723d0d6d0b36e 100644
--- a/Testing/SystemTests/tests/analysis/PolrefExample.py
+++ b/Testing/SystemTests/tests/analysis/PolrefExample.py
@@ -5,11 +5,11 @@
# & Institut Laue - Langevin
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init
-import stresstesting
+import systemtesting
from mantid.simpleapi import *
-class PolrefExample(stresstesting.MantidStressTest):
+class PolrefExample(systemtesting.MantidSystemTest):
''' Sample script from Tim Charlton. Described as Mantid version of quick:lam
Owen Arnold
diff --git a/Testing/SystemTests/tests/analysis/PowderDiffProfileCalibrateTest.py b/Testing/SystemTests/tests/analysis/PowderDiffProfileCalibrateTest.py
index 676ef78b6167fcf32820155363e07cc1040692e1..8261408d5e1a71dfb8ed5d95517e9d9aff912156 100644
--- a/Testing/SystemTests/tests/analysis/PowderDiffProfileCalibrateTest.py
+++ b/Testing/SystemTests/tests/analysis/PowderDiffProfileCalibrateTest.py
@@ -15,12 +15,12 @@
#
########################################################################
from __future__ import (absolute_import, division, print_function)
-import stresstesting
+import systemtesting
import mantid.simpleapi as api
from mantid.simpleapi import *
-class VulcanExamineProfile(stresstesting.MantidStressTest):
+class VulcanExamineProfile(systemtesting.MantidSystemTest):
irf_file = 'arg_powder.irf'
dat_file = 'arg_si.dat'
bkgd_file = 'arg_si_bkgd_polynomial.nxs'
@@ -63,7 +63,7 @@ class VulcanExamineProfile(stresstesting.MantidStressTest):
return ('Arg_Si_Calculated','Arg_Si_golden')
-class VulcanSeqRefineProfileFromScratch(stresstesting.MantidStressTest):
+class VulcanSeqRefineProfileFromScratch(systemtesting.MantidSystemTest):
""" System test for sequential refinement
"""
irf_file = 'VULCAN_SNS_1.irf'
@@ -189,7 +189,7 @@ class VulcanSeqRefineProfileFromScratch(stresstesting.MantidStressTest):
return ('VULCAN_22946_Calculated', 'VULCAN_22946_Calculated')
-class VulcanSeqRefineProfileLoadPlus(stresstesting.MantidStressTest):
+class VulcanSeqRefineProfileLoadPlus(systemtesting.MantidSystemTest):
""" System test for sequential refinement
"""
seqfile = "VULCAN_Calibrate_Seq.nxs"
diff --git a/Testing/SystemTests/tests/analysis/PredictPeaksTest.py b/Testing/SystemTests/tests/analysis/PredictPeaksTest.py
index c67d5a5e3698503a2a82c8ea3f3ada75997053b6..ad75652174df4e24112a589388edd64046eb68d8 100644
--- a/Testing/SystemTests/tests/analysis/PredictPeaksTest.py
+++ b/Testing/SystemTests/tests/analysis/PredictPeaksTest.py
@@ -5,7 +5,7 @@
# & Institut Laue - Langevin
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=no-init,too-few-public-methods
-import stresstesting
+import systemtesting
from mantid.simpleapi import *
from mantid.geometry import CrystalStructure
@@ -16,7 +16,7 @@ from mantid.geometry import CrystalStructure
# The WISH test has a data mismatch which might be caused by the 'old' code having a bug (issue #14105).
# The difference is that peaks may have different d-values because they are assigned to a different detector.
# Instead of using the CompareWorkspaces, only H, K and L are compared.
-class PredictPeaksTestWISH(stresstesting.MantidStressTest):
+class PredictPeaksTestWISH(systemtesting.MantidSystemTest):
def runTest(self):
simulationWorkspace = CreateSimulationWorkspace(Instrument='WISH',
BinParams='0,1,2',
@@ -57,7 +57,7 @@ class PredictPeaksTestWISH(stresstesting.MantidStressTest):
return True, None
-class PredictPeaksTestTOPAZ(stresstesting.MantidStressTest):
+class PredictPeaksTestTOPAZ(systemtesting.MantidSystemTest):
def runTest(self):
direc = config['instrumentDefinition.directory']
xmlFile = os.path.join(direc,'TOPAZ_Definition_2015-01-01.xml')
@@ -77,7 +77,7 @@ class PredictPeaksTestTOPAZ(stresstesting.MantidStressTest):
self.assertTrue(simulationWorkspaceMatch[0])
-class PredictPeaksCalculateStructureFactorsTest(stresstesting.MantidStressTest):
+class PredictPeaksCalculateStructureFactorsTest(systemtesting.MantidSystemTest):
expected_num_peaks = 546
def runTest(self):
diff --git a/Testing/SystemTests/tests/analysis/QENSGlobalFitTeixeiraWaterSQE.py b/Testing/SystemTests/tests/analysis/QENSGlobalFitTeixeiraWaterSQE.py
index 9d23192d02224e5c41be18363bfd9dbd5fd2d640..45e0fa9b05f5f383d33a945df8b22557a119e6d9 100644
--- a/Testing/SystemTests/tests/analysis/QENSGlobalFitTeixeiraWaterSQE.py
+++ b/Testing/SystemTests/tests/analysis/QENSGlobalFitTeixeiraWaterSQE.py
@@ -9,14 +9,14 @@
Extract or compute the Q values from reduced QENS data
"""
from __future__ import (absolute_import, division, print_function)
-from stresstesting import MantidStressTest
+from systemtesting import MantidSystemTest
import mantid
import mantid.simpleapi as sm
import re
import numpy as np
-class GlobalFitTest(MantidStressTest):
+class GlobalFitTest(MantidSystemTest):
"""Global fit of QENS data to the jump-diffusion model by Teixeira
Fitting model. In this case:
Convolution( A*Resolution, x*Delta + (1-x)*TeixeiraWaterSQE ) + LinearBackground
diff --git a/Testing/SystemTests/tests/analysis/RawVNexus.py b/Testing/SystemTests/tests/analysis/RawVNexus.py
index a2e67a98ed3779dae0c0d7aec955f0f2154b448a..649e4a64900ae4d8fe152c1d2b7bceefcd9990f9 100644
--- a/Testing/SystemTests/tests/analysis/RawVNexus.py
+++ b/Testing/SystemTests/tests/analysis/RawVNexus.py
@@ -5,11 +5,11 @@
# & Institut Laue - Langevin
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init,unused-variable
-import stresstesting
+import systemtesting
from mantid.simpleapi import *
-class RawVNexus(stresstesting.MantidStressTest):
+class RawVNexus(systemtesting.MantidSystemTest):
''' Simply tests that our LoadRaw and LoadISISNexus algorithms produce the same workspace'''
def runTest(self):
diff --git a/Testing/SystemTests/tests/analysis/ReduceOneSCD_Run.py b/Testing/SystemTests/tests/analysis/ReduceOneSCD_Run.py
index 05751933e7424cf567ce83bb6062583a1a46657b..3de4c4340603170ab561c5d0697a7987e270aa35 100644
--- a/Testing/SystemTests/tests/analysis/ReduceOneSCD_Run.py
+++ b/Testing/SystemTests/tests/analysis/ReduceOneSCD_Run.py
@@ -22,7 +22,7 @@
from __future__ import (absolute_import, division, print_function)
import time
-import stresstesting
+import systemtesting
import os
from mantid.api import *
@@ -32,7 +32,7 @@ from mantid import config
config['Q.convention'] = 'Crystallography'
-class ReduceOneSCD_Run( stresstesting.MantidStressTest):
+class ReduceOneSCD_Run(systemtesting.MantidSystemTest):
__reduced_ws_name=""
saved=False
diff --git a/Testing/SystemTests/tests/analysis/RefRoi.py b/Testing/SystemTests/tests/analysis/RefRoi.py
index 46da957a5b7ee64b99433b2e40ce4f68bcd5342c..931b9fb9e90975e88666ea548fe14685dc25af7d 100644
--- a/Testing/SystemTests/tests/analysis/RefRoi.py
+++ b/Testing/SystemTests/tests/analysis/RefRoi.py
@@ -5,12 +5,12 @@
# & Institut Laue - Langevin
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init
-import stresstesting
+import systemtesting
from mantid import *
from mantid.simpleapi import *
-class RefRoiTest(stresstesting.MantidStressTest):
+class RefRoiTest(systemtesting.MantidSystemTest):
def runTest(self):
workspace = Load(Filename="REF_L_119814")
workspace = Integration(InputWorkspace=workspace)
diff --git a/Testing/SystemTests/tests/analysis/ReflectometryFloodCorrection.py b/Testing/SystemTests/tests/analysis/ReflectometryFloodCorrection.py
index cada64e0a79561266810b5489596c92c38aa288c..60620d7b3bcaf0db03b5123446ea749637221105 100644
--- a/Testing/SystemTests/tests/analysis/ReflectometryFloodCorrection.py
+++ b/Testing/SystemTests/tests/analysis/ReflectometryFloodCorrection.py
@@ -5,14 +5,14 @@
# & Institut Laue - Langevin
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init
-import stresstesting
+import systemtesting
from mantid.simpleapi import (CreateFloodWorkspace, ApplyFloodWorkspace, CreateWorkspace,
SaveNexus, Load, Rebin, ConvertUnits, mtd)
import os
import tempfile
-class ReflectometryCreateFloodWorkspaceNoExclude(stresstesting.MantidStressTest):
+class ReflectometryCreateFloodWorkspaceNoExclude(systemtesting.MantidSystemTest):
flood_ws_name = 'flood'
@@ -24,7 +24,7 @@ class ReflectometryCreateFloodWorkspaceNoExclude(stresstesting.MantidStressTest)
return self.flood_ws_name,'ReflectometryCreateFloodWorkspaceNoExclude.nxs'
-class ReflectometryCreateFloodWorkspaceExclude(stresstesting.MantidStressTest):
+class ReflectometryCreateFloodWorkspaceExclude(systemtesting.MantidSystemTest):
flood_ws_name = 'flood'
@@ -37,7 +37,7 @@ class ReflectometryCreateFloodWorkspaceExclude(stresstesting.MantidStressTest):
return self.flood_ws_name,'ReflectometryCreateFloodWorkspaceExclude.nxs'
-class ReflectometryCreateFloodWorkspaceQuadratic(stresstesting.MantidStressTest):
+class ReflectometryCreateFloodWorkspaceQuadratic(systemtesting.MantidSystemTest):
flood_ws_name = 'flood'
@@ -50,7 +50,7 @@ class ReflectometryCreateFloodWorkspaceQuadratic(stresstesting.MantidStressTest)
return self.flood_ws_name,'ReflectometryCreateFloodWorkspaceQuadratic.nxs'
-class ReflectometryCreateFloodWorkspaceNegativeBackground(stresstesting.MantidStressTest):
+class ReflectometryCreateFloodWorkspaceNegativeBackground(systemtesting.MantidSystemTest):
flood_ws_name = 'flood'
@@ -66,7 +66,7 @@ class ReflectometryCreateFloodWorkspaceNegativeBackground(stresstesting.MantidSt
os.unlink(input_file)
-class ReflectometryApplyFloodWorkspace(stresstesting.MantidStressTest):
+class ReflectometryApplyFloodWorkspace(systemtesting.MantidSystemTest):
out_ws_name = 'out'
@@ -81,7 +81,7 @@ class ReflectometryApplyFloodWorkspace(stresstesting.MantidStressTest):
return self.out_ws_name,'ReflectometryApplyFloodWorkspace.nxs'
-class ReflectometryApplyFloodWorkspaceRebinned(stresstesting.MantidStressTest):
+class ReflectometryApplyFloodWorkspaceRebinned(systemtesting.MantidSystemTest):
out_ws_name = 'out'
@@ -97,7 +97,7 @@ class ReflectometryApplyFloodWorkspaceRebinned(stresstesting.MantidStressTest):
return self.out_ws_name,'ReflectometryApplyFloodWorkspaceRebinned.nxs'
-class ReflectometryApplyFloodWorkspaceUnits(stresstesting.MantidStressTest):
+class ReflectometryApplyFloodWorkspaceUnits(systemtesting.MantidSystemTest):
out_ws_name = 'out'
@@ -114,7 +114,7 @@ class ReflectometryApplyFloodWorkspaceUnits(stresstesting.MantidStressTest):
return self.out_ws_name,'ReflectometryApplyFloodWorkspaceUnits.nxs'
-class ReflectometryCreateFloodWorkspaceCentralPixel(stresstesting.MantidStressTest):
+class ReflectometryCreateFloodWorkspaceCentralPixel(systemtesting.MantidSystemTest):
flood_ws_name = 'flood'
@@ -137,7 +137,7 @@ class ReflectometryCreateFloodWorkspaceCentralPixel(stresstesting.MantidStressTe
os.unlink(input_file)
-class ReflectometryCreateFloodWorkspaceIntegrationRange(stresstesting.MantidStressTest):
+class ReflectometryCreateFloodWorkspaceIntegrationRange(systemtesting.MantidSystemTest):
flood_ws_name = 'flood'
@@ -160,7 +160,7 @@ class ReflectometryCreateFloodWorkspaceIntegrationRange(stresstesting.MantidStre
os.unlink(input_file)
-class ReflectometryCreateFloodWorkspaceDivisionByZero(stresstesting.MantidStressTest):
+class ReflectometryCreateFloodWorkspaceDivisionByZero(systemtesting.MantidSystemTest):
flood_ws_name = 'flood'
@@ -177,7 +177,7 @@ class ReflectometryCreateFloodWorkspaceDivisionByZero(stresstesting.MantidStress
os.unlink(input_file)
-class ReflectometryCreateFloodWorkspaceCentralPixelExclude(stresstesting.MantidStressTest):
+class ReflectometryCreateFloodWorkspaceCentralPixelExclude(systemtesting.MantidSystemTest):
flood_ws_name = 'flood'
@@ -200,7 +200,7 @@ class ReflectometryCreateFloodWorkspaceCentralPixelExclude(stresstesting.MantidS
os.unlink(input_file)
-class ReflectometryCreateFloodWorkspaceCentralPixelRange(stresstesting.MantidStressTest):
+class ReflectometryCreateFloodWorkspaceCentralPixelRange(systemtesting.MantidSystemTest):
flood_ws_name = 'flood'
diff --git a/Testing/SystemTests/tests/analysis/ReflectometryISIS.py b/Testing/SystemTests/tests/analysis/ReflectometryISIS.py
index 1d1671508fe7079d8b11f71d4bcb6b4d808f3b4d..4859745c90c79eb4e16fc1ae9c2b1cbb76c5ca1c 100644
--- a/Testing/SystemTests/tests/analysis/ReflectometryISIS.py
+++ b/Testing/SystemTests/tests/analysis/ReflectometryISIS.py
@@ -10,14 +10,14 @@ These system tests are to verify the behaviour of the ISIS reflectometry reducti
"""
from __future__ import (absolute_import, division, print_function)
-import stresstesting
+import systemtesting
from mantid.simpleapi import *
from abc import ABCMeta, abstractmethod
from six import with_metaclass
-class ReflectometryISIS(with_metaclass(ABCMeta, stresstesting.MantidStressTest)):
+class ReflectometryISIS(with_metaclass(ABCMeta, systemtesting.MantidSystemTest)):
@abstractmethod
def get_workspace_name(self):
diff --git a/Testing/SystemTests/tests/analysis/ReflectometryQuickCombineMulti.py b/Testing/SystemTests/tests/analysis/ReflectometryQuickCombineMulti.py
index 0e06ebd3e2d34cffdb6957d09e5e61abd117e958..fcbc64e892325a9efe8dba114af5587b87339395 100644
--- a/Testing/SystemTests/tests/analysis/ReflectometryQuickCombineMulti.py
+++ b/Testing/SystemTests/tests/analysis/ReflectometryQuickCombineMulti.py
@@ -5,13 +5,13 @@
# & Institut Laue - Langevin
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init
-import stresstesting
+import systemtesting
from mantid.simpleapi import *
from isis_reflectometry import quick
from isis_reflectometry import combineMulti
-class ReflectometryQuickCombineMulti(stresstesting.MantidStressTest):
+class ReflectometryQuickCombineMulti(systemtesting.MantidSystemTest):
"""
This is a system test for the top-level CombineMulti routines. Quick is the name given to the
ISIS reflectometry reduction scripts. CombineMulti is used for stitching together runs converted Into I/I0 vs |Q| taken at
diff --git a/Testing/SystemTests/tests/analysis/ReflectometryQuickMultiDetector.py b/Testing/SystemTests/tests/analysis/ReflectometryQuickMultiDetector.py
index f2e6bb03849b9a613375705b3bd3fb06c7b0503d..4e946a9a975ab3f2cba0ee463c38aca387774fca 100644
--- a/Testing/SystemTests/tests/analysis/ReflectometryQuickMultiDetector.py
+++ b/Testing/SystemTests/tests/analysis/ReflectometryQuickMultiDetector.py
@@ -5,12 +5,12 @@
# & Institut Laue - Langevin
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init,invalid-name
-import stresstesting
+import systemtesting
from mantid.simpleapi import *
from isis_reflectometry import quick
-class ReflectometryQuickMultiDetector(stresstesting.MantidStressTest):
+class ReflectometryQuickMultiDetector(systemtesting.MantidSystemTest):
"""
This is a system test for the top-level quick routines. Quick is the name given to the
ISIS reflectometry reduction scripts.
diff --git a/Testing/SystemTests/tests/analysis/ReflectometryQuickPointDetector.py b/Testing/SystemTests/tests/analysis/ReflectometryQuickPointDetector.py
index 60f1680cb8a161f9fdcdf3ceb62105579dd1df8a..bd48e695c461e5f49f4ac547f5f2cc968b9ea651 100644
--- a/Testing/SystemTests/tests/analysis/ReflectometryQuickPointDetector.py
+++ b/Testing/SystemTests/tests/analysis/ReflectometryQuickPointDetector.py
@@ -5,12 +5,12 @@
# & Institut Laue - Langevin
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init
-import stresstesting
+import systemtesting
from mantid.simpleapi import *
from isis_reflectometry import quick
-class ReflectometryQuickPointDetector(stresstesting.MantidStressTest):
+class ReflectometryQuickPointDetector(systemtesting.MantidSystemTest):
"""
This is a system test for the top-level quick routines. Quick is the name given to the
ISIS reflectometry reduction scripts. Uses the point detector functionality with real transmission corrections.
diff --git a/Testing/SystemTests/tests/analysis/ReflectometryQuickPointDetectorMakeTransmission.py b/Testing/SystemTests/tests/analysis/ReflectometryQuickPointDetectorMakeTransmission.py
index 9db2e5d0efb93f8a6006ef08b0e10a2eae96a277..ec5c811cdc1dd66e4e8591acc013d4478e154b34 100644
--- a/Testing/SystemTests/tests/analysis/ReflectometryQuickPointDetectorMakeTransmission.py
+++ b/Testing/SystemTests/tests/analysis/ReflectometryQuickPointDetectorMakeTransmission.py
@@ -5,12 +5,12 @@
# & Institut Laue - Langevin
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init
-import stresstesting
+import systemtesting
from mantid.simpleapi import *
from isis_reflectometry import quick
-class ReflectometryQuickPointDetectorMakeTransmission(stresstesting.MantidStressTest):
+class ReflectometryQuickPointDetectorMakeTransmission(systemtesting.MantidSystemTest):
"""
This is a system test for the top-level quick routines. Quick is the name given to the
ISIS reflectometry reduction scripts. Uses the point detector functionality with real transmission corrections.
diff --git a/Testing/SystemTests/tests/analysis/RelectometryInstrumentSignedThetaTest.py b/Testing/SystemTests/tests/analysis/RelectometryInstrumentSignedThetaTest.py
index 037da37ce972f377992cc8e130c698d4bc4b0399..0a6b0d6db3dd87f592d3e4480bdc38e881111d40 100644
--- a/Testing/SystemTests/tests/analysis/RelectometryInstrumentSignedThetaTest.py
+++ b/Testing/SystemTests/tests/analysis/RelectometryInstrumentSignedThetaTest.py
@@ -11,10 +11,10 @@ ISIS reflectometry instruments signed theta value
"""
import os
from mantid.simpleapi import *
-import stresstesting
+import systemtesting
-class ReflectometryInstrumentSignedThetaTest(stresstesting.MantidStressTest):
+class ReflectometryInstrumentSignedThetaTest(systemtesting.MantidSystemTest):
def signed_theta_test(self, idf_name, detector_vertical_position, detector_name = 'point-detector'):
idf_dir=config['instrumentDefinition.directory']
# Load instrument definition
diff --git a/Testing/SystemTests/tests/analysis/ReuseExistingCalibration.py b/Testing/SystemTests/tests/analysis/ReuseExistingCalibration.py
index 93c879d6e343f309daecdca60ec619ce4cc3f918..f0f3e23cc17f1cb557d092f320dfe4e16ebe638e 100644
--- a/Testing/SystemTests/tests/analysis/ReuseExistingCalibration.py
+++ b/Testing/SystemTests/tests/analysis/ReuseExistingCalibration.py
@@ -10,10 +10,10 @@
in successive reductions.
"""
from __future__ import (absolute_import, division, print_function)
-import stresstesting
+import systemtesting
-class ReuseExistingCalibration(stresstesting.MantidStressTest):
+class ReuseExistingCalibration(systemtesting.MantidSystemTest):
det_pos_first_run = None
det_pos_second_run = None
diff --git a/Testing/SystemTests/tests/analysis/SANS2DBatch.py b/Testing/SystemTests/tests/analysis/SANS2DBatch.py
index 1f890bb9ccf9a7f893e6efa272c30efb7aa813f7..d631cf1c8435c630025531584bafaa8283566e0b 100644
--- a/Testing/SystemTests/tests/analysis/SANS2DBatch.py
+++ b/Testing/SystemTests/tests/analysis/SANS2DBatch.py
@@ -7,7 +7,7 @@
#pylint: disable=no-init,attribute-defined-outside-init
from __future__ import (absolute_import, division, print_function)
-import stresstesting
+import systemtesting
from mantid.simpleapi import *
from ISISCommandInterface import *
from mantid import config
@@ -17,7 +17,7 @@ import os.path
# test batch mode with sans2d and selecting a period in batch mode
-class SANS2DBatch(stresstesting.MantidStressTest):
+class SANS2DBatch(systemtesting.MantidSystemTest):
def runTest(self):
@@ -44,7 +44,7 @@ class SANS2DBatch(stresstesting.MantidStressTest):
return '5512p7_SANS2DBatch','SANS2DBatch.nxs'
-class SANS2DNewSettingsCarriedAcrossInBatchMode(stresstesting.MantidStressTest):
+class SANS2DNewSettingsCarriedAcrossInBatchMode(systemtesting.MantidSystemTest):
"""
We want to make sure that any settings saved in the PropertyManager objects
are used across all iterations of the reduction in Batch mode. The MASKFILE
@@ -73,7 +73,7 @@ class SANS2DNewSettingsCarriedAcrossInBatchMode(stresstesting.MantidStressTest):
return "iteration_2", "SANS2DNewSettingsCarriedAcross.nxs"
-class SANS2DTUBESBatchWithZeroErrorCorrection(stresstesting.MantidStressTest):
+class SANS2DTUBESBatchWithZeroErrorCorrection(systemtesting.MantidSystemTest):
"""
We want to make sure that the BatchMode can remove zero error values
and replace them with a large default value.
diff --git a/Testing/SystemTests/tests/analysis/SANS2DBatchTest_V2.py b/Testing/SystemTests/tests/analysis/SANS2DBatchTest_V2.py
index d728ce6262c667a828cbb2d925d664228efacb6e..1cb263604338aa2a7cb631f2fac36fbc6a481a0e 100644
--- a/Testing/SystemTests/tests/analysis/SANS2DBatchTest_V2.py
+++ b/Testing/SystemTests/tests/analysis/SANS2DBatchTest_V2.py
@@ -7,7 +7,7 @@
#pylint: disable=no-init,attribute-defined-outside-init
from __future__ import (absolute_import, division, print_function)
-import stresstesting
+import systemtesting
from mantid import config
from mantid.api import (FileFinder)
@@ -17,7 +17,7 @@ from sans.command_interface.ISISCommandInterface import (SANS2DTUBES, SANS2D, Se
import os.path
-class SANS2DBatchTest_V2(stresstesting.MantidStressTest):
+class SANS2DBatchTest_V2(systemtesting.MantidSystemTest):
def runTest(self):
UseCompatibilityMode()
@@ -40,7 +40,7 @@ class SANS2DBatchTest_V2(stresstesting.MantidStressTest):
return '5512p7_SANS2DBatch', 'SANS2DBatch.nxs'
-class SANS2DNewSettingsCarriedAcrossInBatchModeTest_V2(stresstesting.MantidStressTest):
+class SANS2DNewSettingsCarriedAcrossInBatchModeTest_V2(systemtesting.MantidSystemTest):
"""
We want to make sure that any settings saved in the PropertyManager objects
are used across all iterations of the reduction in Batch mode. The MASKFILE
@@ -77,7 +77,7 @@ class SANS2DNewSettingsCarriedAcrossInBatchModeTest_V2(stresstesting.MantidStres
return "iteration_2", "SANS2DNewSettingsCarriedAcross.nxs"
-class SANS2DTUBESBatchWithZeroErrorCorrectionTest_V2(stresstesting.MantidStressTest):
+class SANS2DTUBESBatchWithZeroErrorCorrectionTest_V2(systemtesting.MantidSystemTest):
"""
We want to make sure that the BatchMode can remove zero error values
and replace them with a large default value.
diff --git a/Testing/SystemTests/tests/analysis/SANS2DFrontNoGrav.py b/Testing/SystemTests/tests/analysis/SANS2DFrontNoGrav.py
index dbbcb9acfddc333c6d1a9224119d6ae77dfb99be..fe923b1be64e7fb4a5ec28b442c03a4839ba57ad 100644
--- a/Testing/SystemTests/tests/analysis/SANS2DFrontNoGrav.py
+++ b/Testing/SystemTests/tests/analysis/SANS2DFrontNoGrav.py
@@ -7,12 +7,12 @@
#pylint: disable=no-init
from __future__ import (absolute_import, division, print_function)
-import stresstesting
+import systemtesting
from mantid.simpleapi import *
from ISISCommandInterface import *
-class SANS2DFrontNoGrav(stresstesting.MantidStressTest):
+class SANS2DFrontNoGrav(systemtesting.MantidSystemTest):
def runTest(self):
@@ -34,7 +34,7 @@ class SANS2DFrontNoGrav(stresstesting.MantidStressTest):
return '2500front_1D_4.6_12.85','SANS2DFrontNoGrav.nxs'
-class SANS2DWithExtraLengthGravity(stresstesting.MantidStressTest):
+class SANS2DWithExtraLengthGravity(systemtesting.MantidSystemTest):
def runTest(self):
SANS2D()
MaskFile('MASKSANS2D_094i_RKH.txt')
diff --git a/Testing/SystemTests/tests/analysis/SANS2DFrontNoGrav_V2.py b/Testing/SystemTests/tests/analysis/SANS2DFrontNoGrav_V2.py
index d7952b2b93e3e93ce467c8cba3b49618bc5a8861..aa36daa08ec79c5295691f996bd943643ebd37f1 100644
--- a/Testing/SystemTests/tests/analysis/SANS2DFrontNoGrav_V2.py
+++ b/Testing/SystemTests/tests/analysis/SANS2DFrontNoGrav_V2.py
@@ -6,13 +6,13 @@
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init
from __future__ import (absolute_import, division, print_function)
-import stresstesting
+import systemtesting
import mantid # noqa
from sans.command_interface.ISISCommandInterface import (SANS2D, MaskFile, SetDetectorOffsets, Gravity, Set1D,
UseCompatibilityMode, AssignSample, WavRangeReduction)
-class SANS2DFrontNoGravTest_V2(stresstesting.MantidStressTest):
+class SANS2DFrontNoGravTest_V2(systemtesting.MantidSystemTest):
def runTest(self):
UseCompatibilityMode()
SANS2D()
@@ -33,7 +33,7 @@ class SANS2DFrontNoGravTest_V2(stresstesting.MantidStressTest):
return '2500front_1D_4.6_12.85', 'SANS2DFrontNoGrav.nxs'
-class SANS2DWithExtraLengthGravityTest_V2(stresstesting.MantidStressTest):
+class SANS2DWithExtraLengthGravityTest_V2(systemtesting.MantidSystemTest):
def runTest(self):
UseCompatibilityMode()
SANS2D()
diff --git a/Testing/SystemTests/tests/analysis/SANS2DLOQReloadWorkspaces.py b/Testing/SystemTests/tests/analysis/SANS2DLOQReloadWorkspaces.py
index 16c6ca5a8f2f94991330508f0806b690a869f222..05eb01aa176b3544629893f06e8c0885e51ced21 100644
--- a/Testing/SystemTests/tests/analysis/SANS2DLOQReloadWorkspaces.py
+++ b/Testing/SystemTests/tests/analysis/SANS2DLOQReloadWorkspaces.py
@@ -6,7 +6,7 @@
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=invalid-name,no-init
from __future__ import (absolute_import, division, print_function)
-import stresstesting
+import systemtesting
from mantid.simpleapi import *
from ISISCommandInterface import *
import unittest
@@ -26,8 +26,8 @@ SANS2DReductionShouldAcceptLoadedWorkspace and SANS2DReductionShouldAcceptLoaded
apply the same requirements for SANS2D instruments.
-LOQReductionShouldAcceptLoadedWorkspaceStressTest, SANS2DReductionShouldAcceptLoadedWorkspaceStressTest
-and SANS2DReductionShouldAcceptLoadedWorkspace are wrappers to make unittest.TestCase to fit the stresstesting
+LOQReductionShouldAcceptLoadedWorkspaceSystemTest, SANS2DReductionShouldAcceptLoadedWorkspaceSystemTest
+and SANS2DReductionShouldAcceptLoadedWorkspace are wrappers to make unittest.TestCase to fit the systemtesting
framework.
The other tests are here to ensure the results of providing directly workspaces will be the same that loading
@@ -124,7 +124,7 @@ class SANS2DReductionShouldAcceptLoadedWorkspaceRawFile(SANS2DReductionShouldAcc
self.control_name = '5547front_1D_4.6_12.85'
-class LOQReductionShouldAcceptLoadedWorkspaceStressTest(stresstesting.MantidStressTest):
+class LOQReductionShouldAcceptLoadedWorkspaceSystemTest(systemtesting.MantidSystemTest):
cl = LOQReductionShouldAcceptLoadedWorkspace
def runTest(self):
@@ -142,15 +142,15 @@ class LOQReductionShouldAcceptLoadedWorkspaceStressTest(stresstesting.MantidStre
return self._success
-class SANS2DReductionShouldAcceptLoadedWorkspaceStressTest(LOQReductionShouldAcceptLoadedWorkspaceStressTest):
+class SANS2DReductionShouldAcceptLoadedWorkspaceSystemTest(LOQReductionShouldAcceptLoadedWorkspaceSystemTest):
cl = SANS2DReductionShouldAcceptLoadedWorkspace
-class SANS2DReductionShouldAcceptLoadedWorkspaceStressTest2(LOQReductionShouldAcceptLoadedWorkspaceStressTest):
+class SANS2DReductionShouldAcceptLoadedWorkspaceSystemTest2(LOQReductionShouldAcceptLoadedWorkspaceSystemTest):
cl = SANS2DReductionShouldAcceptLoadedWorkspaceRawFile
-class LOQTransFitWorkspace2DWithLoadedWorkspace(stresstesting.MantidStressTest):
+class LOQTransFitWorkspace2DWithLoadedWorkspace(systemtesting.MantidSystemTest):
def runTest(self):
config["default.instrument"] = "LOQ"
LOQ()
@@ -182,13 +182,13 @@ class LOQTransFitWorkspace2DWithLoadedWorkspace(stresstesting.MantidStressTest):
return '54431main_2D_3.0_4.0_suff','LOQTransFitWorkspace2D.nxs'
-class LOQReductionOnLoadedWorkspaceMustProduceTheSameResult_1(stresstesting.MantidStressTest):
+class LOQReductionOnLoadedWorkspaceMustProduceTheSameResult_1(systemtesting.MantidSystemTest):
""" It will repeat the test done at LOQCentreNoGrav but using
loaded workspaces
"""
def __init__(self):
- stresstesting.MantidStressTest.__init__(self)
+ systemtesting.MantidSystemTest.__init__(self)
self.tolerance = 1e-6
def runTest(self):
@@ -220,7 +220,7 @@ class LOQReductionOnLoadedWorkspaceMustProduceTheSameResult_1(stresstesting.Mant
return '54431main_1D_3.0_9.0','LOQCentreNoGravSearchCentreFixed.nxs'
-class LOQReductionOnLoadedWorkspaceMustProduceTheSameResult_2(stresstesting.MantidStressTest):
+class LOQReductionOnLoadedWorkspaceMustProduceTheSameResult_2(systemtesting.MantidSystemTest):
"""Before ticket #8461 test LOQReductionOnLoadedWorkspaceMustProduceTheSameResult_1 used
to produce a workspace that matches LOQCentreNoGrav.nxs. This test is created to ensure
that if we put the same centre that was produced before, we finish in the same result
@@ -261,7 +261,7 @@ class LOQReductionOnLoadedWorkspaceMustProduceTheSameResult_2(stresstesting.Mant
return '54431main_1D_3.0_9.0','LOQCentreNoGrav_V2.nxs'
-class SANSLOQCan2DReloadWorkspace(stresstesting.MantidStressTest):
+class SANSLOQCan2DReloadWorkspace(systemtesting.MantidSystemTest):
def runTest(self):
config["default.instrument"] = "LOQ"
@@ -291,7 +291,7 @@ class SANSLOQCan2DReloadWorkspace(stresstesting.MantidStressTest):
return '53615main_2D_2.2_10.0','SANSLOQCan2D.nxs'
-class SANS2DFrontNoGravReloadWorkspace(stresstesting.MantidStressTest):
+class SANS2DFrontNoGravReloadWorkspace(systemtesting.MantidSystemTest):
def runTest(self):
config["default.instrument"] = "SANS2D"
@@ -312,7 +312,7 @@ class SANS2DFrontNoGravReloadWorkspace(stresstesting.MantidStressTest):
return '2500front_1D_4.6_12.85','SANS2DFrontNoGrav.nxs'
-class SANS2DWaveloopsReloadWorkspace(stresstesting.MantidStressTest):
+class SANS2DWaveloopsReloadWorkspace(systemtesting.MantidSystemTest):
def runTest(self):
config["default.instrument"] = "SANS2D"
diff --git a/Testing/SystemTests/tests/analysis/SANS2DLimitEventsTime.py b/Testing/SystemTests/tests/analysis/SANS2DLimitEventsTime.py
index 8a6a03da0f0542ac9fd0767aabe13babc28cecd1..c466614cdb60495271798a4ec11cefc639e2ebb5 100644
--- a/Testing/SystemTests/tests/analysis/SANS2DLimitEventsTime.py
+++ b/Testing/SystemTests/tests/analysis/SANS2DLimitEventsTime.py
@@ -7,12 +7,12 @@
#pylint: disable=no-init
from __future__ import (absolute_import, division, print_function)
-import stresstesting
+import systemtesting
from mantid.simpleapi import *
from ISISCommandInterface import *
-class SANS2DLimitEventsTime(stresstesting.MantidStressTest):
+class SANS2DLimitEventsTime(systemtesting.MantidSystemTest):
def runTest(self):
SANS2D()
diff --git a/Testing/SystemTests/tests/analysis/SANS2DLimitEventsTime_V2.py b/Testing/SystemTests/tests/analysis/SANS2DLimitEventsTime_V2.py
index db8296e7f7cb09957c6bc7a1fed8f91ad9b34b7e..1c09a3f83c9a5cc5f102eb9a58ca7cb9f7c8c87e 100644
--- a/Testing/SystemTests/tests/analysis/SANS2DLimitEventsTime_V2.py
+++ b/Testing/SystemTests/tests/analysis/SANS2DLimitEventsTime_V2.py
@@ -7,13 +7,13 @@
#pylint: disable=no-init
from __future__ import (absolute_import, division, print_function)
-import stresstesting
+import systemtesting
import mantid # noqa
from sans.command_interface.ISISCommandInterface import (SANS2D, MaskFile, AssignSample, WavRangeReduction,
UseCompatibilityMode)
-class SANS2DLimitEventsTimeTest_V2(stresstesting.MantidStressTest):
+class SANS2DLimitEventsTimeTest_V2(systemtesting.MantidSystemTest):
def runTest(self):
UseCompatibilityMode()
SANS2D()
diff --git a/Testing/SystemTests/tests/analysis/SANS2DMultiPeriod.py b/Testing/SystemTests/tests/analysis/SANS2DMultiPeriod.py
index c2029f7afccdc729a938b53f12d3eabf71e68c24..426fe9caa9f77b1d03b388d669006e03be00e541 100644
--- a/Testing/SystemTests/tests/analysis/SANS2DMultiPeriod.py
+++ b/Testing/SystemTests/tests/analysis/SANS2DMultiPeriod.py
@@ -8,13 +8,13 @@
# test batch mode with sans2d and selecting a period in batch mode
from __future__ import (absolute_import, division, print_function)
-import stresstesting
+import systemtesting
from mantid.api import AnalysisDataService
from ISISCommandInterface import *
from SANSBatchMode import *
-class SANS2DMultiPeriodSingle(stresstesting.MantidStressTest):
+class SANS2DMultiPeriodSingle(systemtesting.MantidSystemTest):
reduced=''
@@ -56,7 +56,7 @@ class SANS2DMultiPeriodBatch(SANS2DMultiPeriodSingle):
self.reduced = '5512_SANS2DBatch'
-class LARMORMultiPeriodEventModeLoading(stresstesting.MantidStressTest):
+class LARMORMultiPeriodEventModeLoading(systemtesting.MantidSystemTest):
"""
This test checks if the positioning of all workspaces of a
multi-period event-type file are the same.
diff --git a/Testing/SystemTests/tests/analysis/SANS2DMultiPeriodAddFiles.py b/Testing/SystemTests/tests/analysis/SANS2DMultiPeriodAddFiles.py
index a87510b1cd1a8a8b77c2e56a306827335ddf00c9..475056b0555290316937448958cd3b8119d38aaf 100644
--- a/Testing/SystemTests/tests/analysis/SANS2DMultiPeriodAddFiles.py
+++ b/Testing/SystemTests/tests/analysis/SANS2DMultiPeriodAddFiles.py
@@ -6,7 +6,7 @@
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init
from __future__ import (absolute_import, division, print_function)
-import stresstesting
+import systemtesting
from mantid.simpleapi import *
@@ -14,7 +14,7 @@ from mantid import config
from ISISCommandInterface import *
-class SANS2DMultiPeriodAddFiles(stresstesting.MantidStressTest):
+class SANS2DMultiPeriodAddFiles(systemtesting.MantidSystemTest):
def requiredMemoryMB(self):
"""Requires 2.5Gb"""
@@ -51,7 +51,7 @@ class SANS2DMultiPeriodAddFiles(stresstesting.MantidStressTest):
return '5512p7rear_1D_2.0_4.0Phi-45.0_45.0','SANS2DMultiPeriodAddFiles.nxs'
-class LARMORMultiPeriodAddEventFiles(stresstesting.MantidStressTest):
+class LARMORMultiPeriodAddEventFiles(systemtesting.MantidSystemTest):
def requiredMemoryMB(self):
"""Requires 2.5Gb"""
return 2500
diff --git a/Testing/SystemTests/tests/analysis/SANS2DMultiPeriodAddFilesTest_V2.py b/Testing/SystemTests/tests/analysis/SANS2DMultiPeriodAddFilesTest_V2.py
index efac25d1bddfcd114a1ae5d9e891de0acaae61e5..e064686f1f41be794b87e52cb010a918ec919c63 100644
--- a/Testing/SystemTests/tests/analysis/SANS2DMultiPeriodAddFilesTest_V2.py
+++ b/Testing/SystemTests/tests/analysis/SANS2DMultiPeriodAddFilesTest_V2.py
@@ -8,7 +8,7 @@
from __future__ import (absolute_import, division, print_function)
from __future__ import (absolute_import, division, print_function)
-import stresstesting
+import systemtesting
import os
from mantid.kernel import config
from mantid.api import AnalysisDataService
@@ -17,7 +17,7 @@ from sans.command_interface.ISISCommandInterface import (SANS2D, Set1D, Detector
AddRuns, LARMOR)
-class SANS2DMultiPeriodAddFiles_V2(stresstesting.MantidStressTest):
+class SANS2DMultiPeriodAddFiles_V2(systemtesting.MantidSystemTest):
def requiredMemoryMB(self):
"""Requires 2.5Gb"""
@@ -53,7 +53,7 @@ class SANS2DMultiPeriodAddFiles_V2(stresstesting.MantidStressTest):
return '5512p7rear_1D_2.0_4.0Phi-45.0_45.0', 'SANS2DMultiPeriodAddFiles.nxs'
-class LARMORMultiPeriodAddEventFilesTest_V2(stresstesting.MantidStressTest):
+class LARMORMultiPeriodAddEventFilesTest_V2(systemtesting.MantidSystemTest):
def requiredMemoryMB(self):
"""Requires 2.5Gb"""
return 2500
diff --git a/Testing/SystemTests/tests/analysis/SANS2DMultiPeriod_V2.py b/Testing/SystemTests/tests/analysis/SANS2DMultiPeriod_V2.py
index 38981e6c0f8df663c03a48c5d95c8393d3c85cdb..7dab404f333243ecdbcfcba244cf0eeab80ef8c8 100644
--- a/Testing/SystemTests/tests/analysis/SANS2DMultiPeriod_V2.py
+++ b/Testing/SystemTests/tests/analysis/SANS2DMultiPeriod_V2.py
@@ -7,7 +7,7 @@
#pylint: disable=no-init,too-few-public-methods
from __future__ import (absolute_import, division, print_function)
-import stresstesting
+import systemtesting
import mantid # noqa
from mantid.api import (AnalysisDataService, FileFinder)
@@ -18,7 +18,7 @@ from sans.command_interface.ISISCommandInterface import (SANS2D, Set1D, Detector
# test batch mode with sans2d and selecting a period in batch mode
-class SANS2DMultiPeriodSingleTest_V2(stresstesting.MantidStressTest):
+class SANS2DMultiPeriodSingleTest_V2(systemtesting.MantidSystemTest):
reduced = ''
@@ -60,7 +60,7 @@ class SANS2DMultiPeriodBatchTest_V2(SANS2DMultiPeriodSingleTest_V2):
self.reduced = '5512_SANS2DBatch'
-class LARMORMultiPeriodEventModeLoadingTest_V2(stresstesting.MantidStressTest):
+class LARMORMultiPeriodEventModeLoadingTest_V2(systemtesting.MantidSystemTest):
"""
This test checks if the positioning of all workspaces of a
multi-period event-type file are the same.
diff --git a/Testing/SystemTests/tests/analysis/SANS2DReductionGUI.py b/Testing/SystemTests/tests/analysis/SANS2DReductionGUI.py
index 069510472076bdf8e1291bf94ec413f5f9106fb3..bb5e01fe3843f208bc79f50f867b33ebf3a41a48 100644
--- a/Testing/SystemTests/tests/analysis/SANS2DReductionGUI.py
+++ b/Testing/SystemTests/tests/analysis/SANS2DReductionGUI.py
@@ -20,7 +20,7 @@ Test was first created to apply to Mantid Release 3.0.
"""
from __future__ import (absolute_import, division, print_function)
-import stresstesting
+import systemtesting
from mantid.simpleapi import *
import isis_reducer
import ISISCommandInterface as i
@@ -36,7 +36,7 @@ def s(obj):
print('!'+str(obj)+'!',type(obj))
-class SANS2DMinimalBatchReduction(stresstesting.MantidStressTest):
+class SANS2DMinimalBatchReduction(systemtesting.MantidSystemTest):
"""Minimal script to perform full reduction in batch mode
"""
diff --git a/Testing/SystemTests/tests/analysis/SANS2DReductionGUIAddedTest_V2.py b/Testing/SystemTests/tests/analysis/SANS2DReductionGUIAddedTest_V2.py
index 6f59e2f0e5d14541bb9a11ea898487e74ec8675f..67da998cfc1bc5062a2359fd2c9681b138194fcd 100644
--- a/Testing/SystemTests/tests/analysis/SANS2DReductionGUIAddedTest_V2.py
+++ b/Testing/SystemTests/tests/analysis/SANS2DReductionGUIAddedTest_V2.py
@@ -12,7 +12,7 @@ One test has been removed from the port since it uses the ReductionSingleton.
from __future__ import (absolute_import, division, print_function)
import mantid # noqa
-import stresstesting
+import systemtesting
import os
from mantid.api import AnalysisDataService
from mantid.kernel import config
@@ -23,7 +23,7 @@ from sans.command_interface.ISISCommandInterface import (SANS2DTUBES, MaskFile,
TransmissionCan, WavRangeReduction, UseCompatibilityMode)
-class SANS2DAddedEventFilesWithOverlayTest_V2(stresstesting.MantidStressTest):
+class SANS2DAddedEventFilesWithOverlayTest_V2(systemtesting.MantidSystemTest):
def runTest(self):
UseCompatibilityMode()
SANS2DTUBES()
@@ -62,7 +62,7 @@ class SANS2DAddedEventFilesWithOverlayTest_V2(stresstesting.MantidStressTest):
os.remove(os.path.join(config['defaultsave.directory'], 'SANS2D00028797-add.nxs'))
-class SANS2DAddedEventFilesWithOverlayAndTimeShiftTest_V2(stresstesting.MantidStressTest):
+class SANS2DAddedEventFilesWithOverlayAndTimeShiftTest_V2(systemtesting.MantidSystemTest):
def runTest(self):
UseCompatibilityMode()
SANS2DTUBES()
@@ -106,7 +106,7 @@ class SANS2DAddedEventFilesWithOverlayAndTimeShiftTest_V2(stresstesting.MantidSt
os.remove(os.path.join(config['defaultsave.directory'], 'SANS2D00028797-add.nxs'))
-class SANS2DAddedEventFilesWithoutOverlayTest_V2(stresstesting.MantidStressTest):
+class SANS2DAddedEventFilesWithoutOverlayTest_V2(systemtesting.MantidSystemTest):
def runTest(self):
UseCompatibilityMode()
SANS2DTUBES()
diff --git a/Testing/SystemTests/tests/analysis/SANS2DReductionGUI_V2.py b/Testing/SystemTests/tests/analysis/SANS2DReductionGUI_V2.py
index 25d3585630ff954296e62a537eec9ab003efbcba..02b2867cfc539080e3f36c6ddf5cc6011559c0d5 100644
--- a/Testing/SystemTests/tests/analysis/SANS2DReductionGUI_V2.py
+++ b/Testing/SystemTests/tests/analysis/SANS2DReductionGUI_V2.py
@@ -11,7 +11,7 @@ include details about the ReductionSingleton
"""
from __future__ import (absolute_import, division, print_function)
-import stresstesting
+import systemtesting
from mantid.kernel import (config)
from mantid.api import (FileFinder)
from mantid.simpleapi import RenameWorkspace
@@ -23,7 +23,7 @@ MASKFILE = FileFinder.getFullPath('MaskSANS2DReductionGUI.txt')
BATCHFILE = FileFinder.getFullPath('sans2d_reduction_gui_batch.csv')
-class SANS2DMinimalBatchReductionTest_V2(stresstesting.MantidStressTest):
+class SANS2DMinimalBatchReductionTest_V2(systemtesting.MantidSystemTest):
"""Minimal script to perform full reduction in batch mode
"""
def __init__(self):
@@ -43,7 +43,7 @@ class SANS2DMinimalBatchReductionTest_V2(stresstesting.MantidStressTest):
return "trans_test_rear", "SANSReductionGUI.nxs"
-class SANS2DMinimalSingleReductionTest_V2(stresstesting.MantidStressTest):
+class SANS2DMinimalSingleReductionTest_V2(systemtesting.MantidSystemTest):
"""Minimal script to perform full reduction in single mode"""
def __init__(self):
@@ -68,7 +68,7 @@ class SANS2DMinimalSingleReductionTest_V2(stresstesting.MantidStressTest):
return "trans_test_rear", "SANSReductionGUI.nxs"
-class SANS2DSearchCentreGUI_V2(stresstesting.MantidStressTest):
+class SANS2DSearchCentreGUI_V2(systemtesting.MantidSystemTest):
"""Minimal script to perform FindBeamCentre"""
def __init__(self):
diff --git a/Testing/SystemTests/tests/analysis/SANS2DSlicing.py b/Testing/SystemTests/tests/analysis/SANS2DSlicing.py
index 6f38262dfe6c68987002310dc0a4281488bec4d3..ef77d406df00775cf76861a84a0631b45618444a 100644
--- a/Testing/SystemTests/tests/analysis/SANS2DSlicing.py
+++ b/Testing/SystemTests/tests/analysis/SANS2DSlicing.py
@@ -7,7 +7,7 @@
#pylint: disable=invalid-name,attribute-defined-outside-init
from __future__ import (absolute_import, division, print_function)
-import stresstesting
+import systemtesting
from mantid.simpleapi import *
import ISISCommandInterface as i
@@ -16,7 +16,7 @@ MASKFILE = FileFinder.getFullPath('MaskSANS2DReductionGUI.txt')
BATCHFILE = FileFinder.getFullPath('sans2d_reduction_gui_batch.csv')
-class SANS2DMinimalBatchReductionSliced(stresstesting.MantidStressTest):
+class SANS2DMinimalBatchReductionSliced(systemtesting.MantidSystemTest):
def __init__(self):
super(SANS2DMinimalBatchReductionSliced, self).__init__()
config['default.instrument']='SANS2D'
diff --git a/Testing/SystemTests/tests/analysis/SANS2DSlicingTest_V2.py b/Testing/SystemTests/tests/analysis/SANS2DSlicingTest_V2.py
index 220239e5843813ea4c65cc6b9f4fb266b3951fe6..cb718a7ec9ac683562eb9b36b36e873a5249a9e5 100644
--- a/Testing/SystemTests/tests/analysis/SANS2DSlicingTest_V2.py
+++ b/Testing/SystemTests/tests/analysis/SANS2DSlicingTest_V2.py
@@ -7,7 +7,7 @@
#pylint: disable=invalid-name,attribute-defined-outside-init
from __future__ import (absolute_import, division, print_function)
-import stresstesting
+import systemtesting
from mantid.api import (AnalysisDataService, FileFinder)
from sans.command_interface.ISISCommandInterface import (SANS2D, MaskFile, BatchReduce, SetEventSlices,
UseCompatibilityMode, AssignSample, AssignCan,
@@ -18,7 +18,7 @@ MASKFILE = FileFinder.getFullPath('MaskSANS2DReductionGUI.txt')
BATCHFILE = FileFinder.getFullPath('sans2d_reduction_gui_batch.csv')
-class SANS2DMinimalBatchReductionSlicedTest_V2(stresstesting.MantidStressTest):
+class SANS2DMinimalBatchReductionSlicedTest_V2(systemtesting.MantidSystemTest):
def __init__(self):
super(SANS2DMinimalBatchReductionSlicedTest_V2, self).__init__()
@@ -39,7 +39,7 @@ class SANS2DMinimalBatchReductionSlicedTest_V2(stresstesting.MantidStressTest):
return '', 'SANSReductionGUI.nxs'
-class SANS2DMinimalSingleReductionSlicedTest_V2(stresstesting.MantidStressTest):
+class SANS2DMinimalSingleReductionSlicedTest_V2(systemtesting.MantidSystemTest):
def __init__(self):
super(SANS2DMinimalSingleReductionSlicedTest_V2, self).__init__()
diff --git a/Testing/SystemTests/tests/analysis/SANS2DWaveloops.py b/Testing/SystemTests/tests/analysis/SANS2DWaveloops.py
index 7347d61b848b9765fce05be8e7f55b3f01113746..7412ba5841495295f7b33864bb07e6fa74713079 100644
--- a/Testing/SystemTests/tests/analysis/SANS2DWaveloops.py
+++ b/Testing/SystemTests/tests/analysis/SANS2DWaveloops.py
@@ -7,12 +7,12 @@
#pylint: disable=no-init
from __future__ import (absolute_import, division, print_function)
-import stresstesting
+import systemtesting
from mantid.simpleapi import *
from ISISCommandInterface import *
-class SANS2DWaveloops(stresstesting.MantidStressTest):
+class SANS2DWaveloops(systemtesting.MantidSystemTest):
def runTest(self):
diff --git a/Testing/SystemTests/tests/analysis/SANS2DWaveloopsTest_V2.py b/Testing/SystemTests/tests/analysis/SANS2DWaveloopsTest_V2.py
index 938ec3d6d7bad1be25750ace224cb5109203bc5f..a1480f67c129b04062ee54574c603467fa47c35b 100644
--- a/Testing/SystemTests/tests/analysis/SANS2DWaveloopsTest_V2.py
+++ b/Testing/SystemTests/tests/analysis/SANS2DWaveloopsTest_V2.py
@@ -6,14 +6,14 @@
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init
from __future__ import (absolute_import, division, print_function)
-import stresstesting
+import systemtesting
import mantid # noqa
from sans.command_interface.ISISCommandInterface import (SANS2D, MaskFile, Gravity, Set1D, AssignSample,
TransmissionSample, AssignCan, TransmissionCan,
CompWavRanges, UseCompatibilityMode)
-class SANS2DWaveloopsTest_V2(stresstesting.MantidStressTest):
+class SANS2DWaveloopsTest_V2(systemtesting.MantidSystemTest):
def runTest(self):
UseCompatibilityMode()
SANS2D()
diff --git a/Testing/SystemTests/tests/analysis/SANSBatchReductionTest.py b/Testing/SystemTests/tests/analysis/SANSBatchReductionTest.py
index 834be28d8d487452b86cc105df232e08aa0b3cbb..ceb5b6b3fd08eb60ab0ac23027005674326ac362 100644
--- a/Testing/SystemTests/tests/analysis/SANSBatchReductionTest.py
+++ b/Testing/SystemTests/tests/analysis/SANSBatchReductionTest.py
@@ -7,7 +7,7 @@
# pylint: disable=too-many-public-methods, invalid-name, too-many-arguments
from __future__ import (absolute_import, division, print_function)
import unittest
-import stresstesting
+import systemtesting
from mantid.api import AnalysisDataService
from sans.sans_batch import SANSBatchReduction
@@ -315,9 +315,9 @@ class SANSBatchReductionTest(unittest.TestCase):
AnalysisDataService.remove(element)
-class SANSBatchReductionRunnerTest(stresstesting.MantidStressTest):
+class SANSBatchReductionRunnerTest(systemtesting.MantidSystemTest):
def __init__(self):
- stresstesting.MantidStressTest.__init__(self)
+ systemtesting.MantidSystemTest.__init__(self)
self._success = False
def runTest(self):
diff --git a/Testing/SystemTests/tests/analysis/SANSBeamCentreFinderCoreTest.py b/Testing/SystemTests/tests/analysis/SANSBeamCentreFinderCoreTest.py
index f77011b29056f75e491a5fc573b7a3ba2babb783..8550f89fa717ca9608b4c0de78c82f412af30540 100644
--- a/Testing/SystemTests/tests/analysis/SANSBeamCentreFinderCoreTest.py
+++ b/Testing/SystemTests/tests/analysis/SANSBeamCentreFinderCoreTest.py
@@ -9,7 +9,7 @@
from __future__ import (absolute_import, division, print_function)
import unittest
import os
-import stresstesting
+import systemtesting
import mantid
from mantid.api import AlgorithmManager
@@ -195,9 +195,9 @@ class SANSBeamCentreFinderCoreTest(unittest.TestCase):
self._compare_workspace(output_workspace_bottom, reference_file_name_bottom)
-class SANSBeamCentreCoreRunnerTest(stresstesting.MantidStressTest):
+class SANSBeamCentreCoreRunnerTest(systemtesting.MantidSystemTest):
def __init__(self):
- stresstesting.MantidStressTest.__init__(self)
+ systemtesting.MantidSystemTest.__init__(self)
self._success = False
def runTest(self):
diff --git a/Testing/SystemTests/tests/analysis/SANSCentreSample.py b/Testing/SystemTests/tests/analysis/SANSCentreSample.py
index f890e479ae934f08a0b04e24a40f39dfd31dce62..078e54c6e1d725131530ba5eacf52432e246987a 100644
--- a/Testing/SystemTests/tests/analysis/SANSCentreSample.py
+++ b/Testing/SystemTests/tests/analysis/SANSCentreSample.py
@@ -7,12 +7,12 @@
#pylint: disable=no-init
from __future__ import (absolute_import, division, print_function)
-import stresstesting
+import systemtesting
from mantid.simpleapi import *
from ISISCommandInterface import *
-class SANSCentreSample(stresstesting.MantidStressTest):
+class SANSCentreSample(systemtesting.MantidSystemTest):
def runTest(self):
diff --git a/Testing/SystemTests/tests/analysis/SANSDarkRunSubtractionTest.py b/Testing/SystemTests/tests/analysis/SANSDarkRunSubtractionTest.py
index f32ae6110a0673e35149f37e307def777269aa5b..6f8a7a4eec32484188f19c4a8bf4023111e4b6a8 100644
--- a/Testing/SystemTests/tests/analysis/SANSDarkRunSubtractionTest.py
+++ b/Testing/SystemTests/tests/analysis/SANSDarkRunSubtractionTest.py
@@ -10,7 +10,7 @@
#pylint: disable=too-many-public-methods
from __future__ import (absolute_import, division, print_function)
import unittest
-import stresstesting
+import systemtesting
from mantid.simpleapi import *
from isis_reduction_steps import DarkRunSubtraction
from SANSUserFileParser import DarkRunSettings
@@ -621,9 +621,9 @@ class DarkRunSubtractionTest(unittest.TestCase):
mon_number = mon_number)
-class DarkRunSubtractionTestStressTest(stresstesting.MantidStressTest):
+class DarkRunSubtractionTestSystemTest(systemtesting.MantidSystemTest):
def __init__(self):
- stresstesting.MantidStressTest.__init__(self)
+ systemtesting.MantidSystemTest.__init__(self)
self._success = False
def runTest(self):
diff --git a/Testing/SystemTests/tests/analysis/SANSDiagnosticPageTest.py b/Testing/SystemTests/tests/analysis/SANSDiagnosticPageTest.py
index da0f0c83e9438509dba1b9e3034448bf00a661f7..0d90b158bd5ba91dc8cead258b5a5130c6b00202 100644
--- a/Testing/SystemTests/tests/analysis/SANSDiagnosticPageTest.py
+++ b/Testing/SystemTests/tests/analysis/SANSDiagnosticPageTest.py
@@ -9,7 +9,7 @@
from __future__ import (absolute_import, division, print_function)
import unittest
import os
-import stresstesting
+import systemtesting
import mantid
@@ -135,9 +135,9 @@ class SANSDiagnosticPageTest(unittest.TestCase):
self._compare_workspace(output_workspaces[0], reference_file_name)
-class SANSDiagnosticPageRunnerTest(stresstesting.MantidStressTest):
+class SANSDiagnosticPageRunnerTest(systemtesting.MantidSystemTest):
def __init__(self):
- stresstesting.MantidStressTest.__init__(self)
+ systemtesting.MantidSystemTest.__init__(self)
self._success = False
def runTest(self):
diff --git a/Testing/SystemTests/tests/analysis/SANSFileChecking.py b/Testing/SystemTests/tests/analysis/SANSFileChecking.py
index 5ca85a326560ba398c08ac361a8fb7af47a5c4c6..77bfc98852d53064834513d6080424a497d6c42a 100644
--- a/Testing/SystemTests/tests/analysis/SANSFileChecking.py
+++ b/Testing/SystemTests/tests/analysis/SANSFileChecking.py
@@ -12,7 +12,7 @@ Check that file manipulation works fine
from __future__ import (absolute_import, division, print_function)
import unittest
-import stresstesting
+import systemtesting
from mantid.simpleapi import *
import SANSUtility as su
import os
@@ -221,9 +221,9 @@ class SANSMatchIDFInReducerAndWorkspaceTest(unittest.TestCase):
self.assertEqual(os.path.normpath(idf_workspace), os.path.normpath(idf_reducer_after))
-class SANSSwitchIDFTestRunner(stresstesting.MantidStressTest):
+class SANSSwitchIDFTestRunner(systemtesting.MantidSystemTest):
def __init__(self):
- stresstesting.MantidStressTest.__init__(self)
+ systemtesting.MantidSystemTest.__init__(self)
self._success = False
def runTest(self):
diff --git a/Testing/SystemTests/tests/analysis/SANSILLReductionTest.py b/Testing/SystemTests/tests/analysis/SANSILLReductionTest.py
index f62a2f9f6fb7ebe9cfcbd78f2cdb6e9a4306c2b7..218df36f0ae72933f6a1b5a2f683aed981ae22fb 100644
--- a/Testing/SystemTests/tests/analysis/SANSILLReductionTest.py
+++ b/Testing/SystemTests/tests/analysis/SANSILLReductionTest.py
@@ -6,11 +6,11 @@
# SPDX - License - Identifier: GPL - 3.0 +
from __future__ import (absolute_import, division, print_function)
-import stresstesting
+import systemtesting
from mantid.simpleapi import SANSILLReduction, Q1DWeighted, config, mtd
-class ILL_D11_Test(stresstesting.MantidStressTest):
+class ILL_D11_Test(systemtesting.MantidSystemTest):
def __init__(self):
super(ILL_D11_Test, self).__init__()
diff --git a/Testing/SystemTests/tests/analysis/SANSLOQBatch.py b/Testing/SystemTests/tests/analysis/SANSLOQBatch.py
index 394d17b8c1d8560009771ca691527f0b587128df..5f704191ac34e51f5698423b0d1b8eb35f30fbeb 100644
--- a/Testing/SystemTests/tests/analysis/SANSLOQBatch.py
+++ b/Testing/SystemTests/tests/analysis/SANSLOQBatch.py
@@ -7,7 +7,7 @@
#pylint: disable=no-init
from __future__ import (absolute_import, division, print_function)
-import stresstesting
+import systemtesting
from mantid.simpleapi import *
from mantid import config
from ISISCommandInterface import *
@@ -15,7 +15,7 @@ from SANSBatchMode import *
import os.path
-class SANSLOQBatch(stresstesting.MantidStressTest):
+class SANSLOQBatch(systemtesting.MantidSystemTest):
def runTest(self):
#DataPath("../Data/LOQ/")
diff --git a/Testing/SystemTests/tests/analysis/SANSLOQBatch_V2.py b/Testing/SystemTests/tests/analysis/SANSLOQBatch_V2.py
index 1d8779e99840882a7c34fac511f23c193e248ab7..b552af79a8db806c84f25bcc83aff781933b2e4e 100644
--- a/Testing/SystemTests/tests/analysis/SANSLOQBatch_V2.py
+++ b/Testing/SystemTests/tests/analysis/SANSLOQBatch_V2.py
@@ -7,7 +7,7 @@
#pylint: disable=no-init
from __future__ import (absolute_import, division, print_function)
-import stresstesting
+import systemtesting
import os.path
from mantid.kernel import config
from mantid.api import FileFinder
@@ -16,7 +16,7 @@ from sans.command_interface.ISISCommandInterface import (LOQ, Detector, Set1D, M
BatchReduce, UseCompatibilityMode)
-class SANSLOQBatchTest_V2(stresstesting.MantidStressTest):
+class SANSLOQBatchTest_V2(systemtesting.MantidSystemTest):
def runTest(self):
UseCompatibilityMode()
diff --git a/Testing/SystemTests/tests/analysis/SANSLOQCan2D.py b/Testing/SystemTests/tests/analysis/SANSLOQCan2D.py
index bdb996592bf2d466a0a96da5689ead508b58e7cf..491a9315c2f1281828cb79541d7726ebd5842bea 100644
--- a/Testing/SystemTests/tests/analysis/SANSLOQCan2D.py
+++ b/Testing/SystemTests/tests/analysis/SANSLOQCan2D.py
@@ -7,14 +7,14 @@
#pylint: disable=no-init
from __future__ import (absolute_import, division, print_function)
-import stresstesting
+import systemtesting
from mantid.simpleapi import *
from ISISCommandInterface import *
# Test is giving odd results on Linux, but only this 2D one.
-class SANSLOQCan2D(stresstesting.MantidStressTest):
+class SANSLOQCan2D(systemtesting.MantidSystemTest):
def runTest(self):
diff --git a/Testing/SystemTests/tests/analysis/SANSLOQCan2D_V2.py b/Testing/SystemTests/tests/analysis/SANSLOQCan2D_V2.py
index 5f1ec2453b783fdcee3f4c70224ae5d35de51945..000e5c6917097b8767395f0a1e319b44d4faed74 100644
--- a/Testing/SystemTests/tests/analysis/SANSLOQCan2D_V2.py
+++ b/Testing/SystemTests/tests/analysis/SANSLOQCan2D_V2.py
@@ -7,7 +7,7 @@
#pylint: disable=no-init
from __future__ import (absolute_import, division, print_function)
-import stresstesting
+import systemtesting
import mantid # noqa
from sans.command_interface.ISISCommandInterface import (LOQ, Set2D, Detector, MaskFile, SetDetectorOffsets, Gravity,
AssignSample, AssignCan, WavRangeReduction,
@@ -16,7 +16,7 @@ from sans.command_interface.ISISCommandInterface import (LOQ, Set2D, Detector, M
# Test is giving odd results on Linux, but only this 2D one.
-class SANSLOQCan2DTest_V2(stresstesting.MantidStressTest):
+class SANSLOQCan2DTest_V2(systemtesting.MantidSystemTest):
def runTest(self):
UseCompatibilityMode()
diff --git a/Testing/SystemTests/tests/analysis/SANSLoadTest.py b/Testing/SystemTests/tests/analysis/SANSLoadTest.py
index b331966ea05c18cf01cb234d1b2bb16dcde659b1..efd3d8b4c8fb76f992ea02d8ca75e00490c686a9 100644
--- a/Testing/SystemTests/tests/analysis/SANSLoadTest.py
+++ b/Testing/SystemTests/tests/analysis/SANSLoadTest.py
@@ -8,7 +8,7 @@
from __future__ import (absolute_import, division, print_function)
import unittest
-import stresstesting
+import systemtesting
from mantid.dataobjects import (Workspace2D, EventWorkspace)
from mantid.api import (AnalysisDataService, AlgorithmManager)
@@ -495,9 +495,9 @@ class SANSLoadTest(unittest.TestCase):
remove_all_workspaces_from_ads()
-class SANSLoadDataRunnerTest(stresstesting.MantidStressTest):
+class SANSLoadDataRunnerTest(systemtesting.MantidSystemTest):
def __init__(self):
- stresstesting.MantidStressTest.__init__(self)
+ systemtesting.MantidSystemTest.__init__(self)
self._success = False
def runTest(self):
diff --git a/Testing/SystemTests/tests/analysis/SANSLoadersTest.py b/Testing/SystemTests/tests/analysis/SANSLoadersTest.py
index c17b96820dcdeb14fd584244385edf711d0bacda..cb55ed98b5f0635823fd5570ebabd94255b649a4 100644
--- a/Testing/SystemTests/tests/analysis/SANSLoadersTest.py
+++ b/Testing/SystemTests/tests/analysis/SANSLoadersTest.py
@@ -13,7 +13,7 @@ currently available inside the systemtests.
from __future__ import (absolute_import, division, print_function)
import unittest
-import stresstesting
+import systemtesting
from mantid.simpleapi import *
import isis_reduction_steps as steps
import ISISCommandInterface as ici
@@ -147,7 +147,7 @@ class LoadSampleTest(unittest.TestCase):
self.assertAlmostEqual(cur_pos[1], -0.002)
-class LoadSampleTestStressTest(stresstesting.MantidStressTest):
+class LoadSampleTestSystemTest(systemtesting.MantidSystemTest):
def runTest(self):
self._success = False
suite = unittest.TestSuite()
@@ -165,9 +165,9 @@ class LoadSampleTestStressTest(stresstesting.MantidStressTest):
return self._success
-class LoadAddedEventDataSampleTestStressTest(stresstesting.MantidStressTest):
+class LoadAddedEventDataSampleTestSystemTest(systemtesting.MantidSystemTest):
def __init__(self):
- stresstesting.MantidStressTest.__init__(self)
+ systemtesting.MantidSystemTest.__init__(self)
self._success = False
def runTest(self):
diff --git a/Testing/SystemTests/tests/analysis/SANSMaskWorkspaceTest.py b/Testing/SystemTests/tests/analysis/SANSMaskWorkspaceTest.py
index 0c4056a1c2eec6ac1ba5b2265c0a94a6a9361494..dd4ab50c3c05747c020ce6e5f5cc757ae4065679 100644
--- a/Testing/SystemTests/tests/analysis/SANSMaskWorkspaceTest.py
+++ b/Testing/SystemTests/tests/analysis/SANSMaskWorkspaceTest.py
@@ -7,7 +7,7 @@
# pylint: disable=too-many-public-methods, invalid-name, too-many-arguments
import unittest
-import stresstesting
+import systemtesting
import os
import mantid
@@ -556,9 +556,9 @@ class SANSMaskWorkspaceTest(unittest.TestCase):
self._do_assert(workspace, expected_spectra)
-class SANSMaskWorkspaceRunnerTest(stresstesting.MantidStressTest):
+class SANSMaskWorkspaceRunnerTest(systemtesting.MantidSystemTest):
def __init__(self):
- stresstesting.MantidStressTest.__init__(self)
+ systemtesting.MantidSystemTest.__init__(self)
self._success = False
def runTest(self):
diff --git a/Testing/SystemTests/tests/analysis/SANSMergedDetectorsTest.py b/Testing/SystemTests/tests/analysis/SANSMergedDetectorsTest.py
index dc39c9d4a1fa6cbcb906b7f9b7cac22ac276c1e1..c9f32a04d081870647068db415ad652dfd86bd42 100644
--- a/Testing/SystemTests/tests/analysis/SANSMergedDetectorsTest.py
+++ b/Testing/SystemTests/tests/analysis/SANSMergedDetectorsTest.py
@@ -9,12 +9,12 @@
from __future__ import (absolute_import, division, print_function)
from mantid.simpleapi import *
import ISISCommandInterface as i
-import stresstesting
+import systemtesting
-class SANSMergedDetectorsTest(stresstesting.MantidStressTest):
+class SANSMergedDetectorsTest(systemtesting.MantidSystemTest):
def __init__(self):
- stresstesting.MantidStressTest.__init__(self)
+ systemtesting.MantidSystemTest.__init__(self)
def runTest(self):
# Select instrument and user file
diff --git a/Testing/SystemTests/tests/analysis/SANSMergedDetectorsTest_V2.py b/Testing/SystemTests/tests/analysis/SANSMergedDetectorsTest_V2.py
index a9abc9872337320760259b9d46851736cc726bd4..6c262ed7ecb2f0f14f8c70b972a4c0bf9bb9e2cd 100644
--- a/Testing/SystemTests/tests/analysis/SANSMergedDetectorsTest_V2.py
+++ b/Testing/SystemTests/tests/analysis/SANSMergedDetectorsTest_V2.py
@@ -7,7 +7,7 @@
#pylint: disable=invalid-name
from __future__ import (absolute_import, division, print_function)
-import stresstesting
+import systemtesting
from mantid.simpleapi import DeleteWorkspace, mtd
from sans.command_interface.ISISCommandInterface import (SANS2DTUBES, MaskFile, SetDetectorOffsets, Gravity, Set1D,
SetFrontDetRescaleShift, WavRangeReduction, AssignSample,
@@ -15,9 +15,9 @@ from sans.command_interface.ISISCommandInterface import (SANS2DTUBES, MaskFile,
UseCompatibilityMode)
-class SANSMergedDetectorsTest_V2(stresstesting.MantidStressTest):
+class SANSMergedDetectorsTest_V2(systemtesting.MantidSystemTest):
def __init__(self):
- stresstesting.MantidStressTest.__init__(self)
+ systemtesting.MantidSystemTest.__init__(self)
def runTest(self):
# Select instrument and user file
diff --git a/Testing/SystemTests/tests/analysis/SANSMoveTest.py b/Testing/SystemTests/tests/analysis/SANSMoveTest.py
index 18961091032168852fa14e565c4b509fca640fa3..95abc6e8ade83d0f6eb59c3e56aeae4934d40f4e 100644
--- a/Testing/SystemTests/tests/analysis/SANSMoveTest.py
+++ b/Testing/SystemTests/tests/analysis/SANSMoveTest.py
@@ -8,7 +8,7 @@
from __future__ import (absolute_import, division, print_function)
import unittest
-import stresstesting
+import systemtesting
from mantid.api import AlgorithmManager
@@ -422,9 +422,9 @@ class SANSMoveTest(unittest.TestCase):
component_to_investigate, state.move, workspace)
-class SANSMoveRunnerTest(stresstesting.MantidStressTest):
+class SANSMoveRunnerTest(systemtesting.MantidSystemTest):
def __init__(self):
- stresstesting.MantidStressTest.__init__(self)
+ systemtesting.MantidSystemTest.__init__(self)
self._success = False
def runTest(self):
diff --git a/Testing/SystemTests/tests/analysis/SANSQResolutionTest.py b/Testing/SystemTests/tests/analysis/SANSQResolutionTest.py
index c7d71c630784ef099e0b2ef4f674e71ac48e4f33..6aec5cf722c5c01483b77da2d1df4b0ad5a7a77c 100644
--- a/Testing/SystemTests/tests/analysis/SANSQResolutionTest.py
+++ b/Testing/SystemTests/tests/analysis/SANSQResolutionTest.py
@@ -7,12 +7,12 @@
#pylint: disable=no-init
from __future__ import (absolute_import, division, print_function)
-import stresstesting
+import systemtesting
from mantid.simpleapi import *
from ISISCommandInterface import *
-class SANSQResolutionWithoutGravity(stresstesting.MantidStressTest):
+class SANSQResolutionWithoutGravity(systemtesting.MantidSystemTest):
def runTest(self):
SANS2D()
MaskFile('MASKSANS2D_094i_RKH.txt')
@@ -38,7 +38,7 @@ class SANSQResolutionWithoutGravity(stresstesting.MantidStressTest):
return True
-class SANSQResolutionWithGravity(stresstesting.MantidStressTest):
+class SANSQResolutionWithGravity(systemtesting.MantidSystemTest):
def runTest(self):
SANS2D()
MaskFile('MASKSANS2D_094i_RKH.txt')
diff --git a/Testing/SystemTests/tests/analysis/SANSReductionCoreTest.py b/Testing/SystemTests/tests/analysis/SANSReductionCoreTest.py
index 7c3affeb82629ab4ea88fb5588ed7e0020fb8f64..e9f0e62d6cdfec62d2aba3b3466a278581018db9 100644
--- a/Testing/SystemTests/tests/analysis/SANSReductionCoreTest.py
+++ b/Testing/SystemTests/tests/analysis/SANSReductionCoreTest.py
@@ -9,7 +9,7 @@
from __future__ import (absolute_import, division, print_function)
import unittest
import os
-import stresstesting
+import systemtesting
import mantid
from mantid.api import AlgorithmManager
@@ -188,9 +188,9 @@ class SANSReductionCoreTest(unittest.TestCase):
self._compare_workspace(unfitted_transmission, unfitted_transmission_reference_file)
-class SANSReductionCoreRunnerTest(stresstesting.MantidStressTest):
+class SANSReductionCoreRunnerTest(systemtesting.MantidSystemTest):
def __init__(self):
- stresstesting.MantidStressTest.__init__(self)
+ systemtesting.MantidSystemTest.__init__(self)
self._success = False
def runTest(self):
diff --git a/Testing/SystemTests/tests/analysis/SANSSaveTest.py b/Testing/SystemTests/tests/analysis/SANSSaveTest.py
index 01f82ce595b0b0ca2978c627be1f4b3884eceb60..c69c993b4e4070317fb5bbbe0ad0ae6a07f0c5b4 100644
--- a/Testing/SystemTests/tests/analysis/SANSSaveTest.py
+++ b/Testing/SystemTests/tests/analysis/SANSSaveTest.py
@@ -10,7 +10,7 @@ from __future__ import (absolute_import, division, print_function)
import os
import mantid
import unittest
-import stresstesting
+import systemtesting
from sans.common.general_functions import create_unmanaged_algorithm
from sans.common.constants import EMPTY_NAME
@@ -185,9 +185,9 @@ class SANSSaveTest(unittest.TestCase):
self._remove_file(file_name)
-class SANSSaveRunnerTest(stresstesting.MantidStressTest):
+class SANSSaveRunnerTest(systemtesting.MantidSystemTest):
def __init__(self):
- stresstesting.MantidStressTest.__init__(self)
+ systemtesting.MantidSystemTest.__init__(self)
self._success = False
def runTest(self):
diff --git a/Testing/SystemTests/tests/analysis/SANSSingleReductionTest.py b/Testing/SystemTests/tests/analysis/SANSSingleReductionTest.py
index 085ebada06e4a260a72c63382b66f1643e654782..992bf6444a9d2dc0aa6933b3fa80584582c81780 100644
--- a/Testing/SystemTests/tests/analysis/SANSSingleReductionTest.py
+++ b/Testing/SystemTests/tests/analysis/SANSSingleReductionTest.py
@@ -8,7 +8,7 @@
from __future__ import (absolute_import, division, print_function)
import unittest
-import stresstesting
+import systemtesting
import mantid # noqa
from mantid.api import AlgorithmManager
@@ -374,9 +374,9 @@ class SANSSingleReductionTest(unittest.TestCase):
self._compare_workspace(output_workspace, reference_file_name)
-class SANSReductionRunnerTest(stresstesting.MantidStressTest):
+class SANSReductionRunnerTest(systemtesting.MantidSystemTest):
def __init__(self):
- stresstesting.MantidStressTest.__init__(self)
+ systemtesting.MantidSystemTest.__init__(self)
self._success = False
def runTest(self):
diff --git a/Testing/SystemTests/tests/analysis/SANSWorkspaceTypeTest.py b/Testing/SystemTests/tests/analysis/SANSWorkspaceTypeTest.py
index e330cdf8bc8c3c7981421d24343e62c5e5037ee5..13fe7f4530449665680a8fba322277f6be75aba1 100644
--- a/Testing/SystemTests/tests/analysis/SANSWorkspaceTypeTest.py
+++ b/Testing/SystemTests/tests/analysis/SANSWorkspaceTypeTest.py
@@ -6,7 +6,7 @@
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=invalid-name,no-init
from __future__ import (absolute_import, division, print_function)
-import stresstesting
+import systemtesting
from mantid.simpleapi import *
from SANSUtility import can_load_as_event_workspace
import os
@@ -31,14 +31,14 @@ def clean_up_workspaces():
DeleteWorkspace(element)
-class SANSProcessedEventWorkspaceInFile(stresstesting.MantidStressTest):
+class SANSProcessedEventWorkspaceInFile(systemtesting.MantidSystemTest):
'''
Check if a processed nexus file is correctly detected to contain
an event workspace.
'''
def __init__(self):
- stresstesting.MantidStressTest.__init__(self)
+ systemtesting.MantidSystemTest.__init__(self)
self._success = False
def runTest(self):
@@ -62,14 +62,14 @@ class SANSProcessedEventWorkspaceInFile(stresstesting.MantidStressTest):
return self._success
-class SANSProcessedHistoWorkspaceInFile(stresstesting.MantidStressTest):
+class SANSProcessedHistoWorkspaceInFile(systemtesting.MantidSystemTest):
'''
Check if a processed nexus file is correctly detected to contain
a histo workspace.
'''
def __init__(self):
- stresstesting.MantidStressTest.__init__(self)
+ systemtesting.MantidSystemTest.__init__(self)
self._success = False
def runTest(self):
diff --git a/Testing/SystemTests/tests/analysis/SEQUOIAreduction.py b/Testing/SystemTests/tests/analysis/SEQUOIAreduction.py
index 5f4ea40f64b6b061921e45ce0577779dea67cd96..51bbd274092ee4799a9d54787c599f12934c823d 100644
--- a/Testing/SystemTests/tests/analysis/SEQUOIAreduction.py
+++ b/Testing/SystemTests/tests/analysis/SEQUOIAreduction.py
@@ -10,7 +10,7 @@ Test the SNS inelatic reduction scripts.
"""
from __future__ import (absolute_import, division, print_function)
-import stresstesting
+import systemtesting
import os
import shutil
import glob
@@ -19,7 +19,7 @@ import mantid
from mantid.simpleapi import *
-class DirectInelaticSNSTest(stresstesting.MantidStressTest):
+class DirectInelaticSNSTest(systemtesting.MantidSystemTest):
_nxspe_filename=""
customDataDir=""
@@ -148,7 +148,7 @@ class DirectInelaticSNSTest(stresstesting.MantidStressTest):
else:
LoadNexus(Filename=os.path.join(self.customDataDir,"van.nx5"),OutputWorkspace="VAN")
- #functions from stresstesting
+ #functions from systemtesting
def requiredFiles(self):
return ['SEQ_12384_event.nxs']
diff --git a/Testing/SystemTests/tests/analysis/SNAPRedux.py b/Testing/SystemTests/tests/analysis/SNAPRedux.py
index e0b6e169fca9178ffdcad107e0c9d53aadc45be2..90bd919e8140f4e3256fbeac86a883e585dee991 100644
--- a/Testing/SystemTests/tests/analysis/SNAPRedux.py
+++ b/Testing/SystemTests/tests/analysis/SNAPRedux.py
@@ -6,7 +6,7 @@
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init,invalid-name,attribute-defined-outside-init
from __future__ import (absolute_import, division, print_function)
-import stresstesting
+import systemtesting
from mantid.simpleapi import *
import os
@@ -43,7 +43,7 @@ def do_cleanup():
return True
-class SNAP_short(stresstesting.MantidStressTest):
+class SNAP_short(systemtesting.MantidSystemTest):
def skipTests(self):
return _skip_test()
@@ -70,7 +70,7 @@ class SNAP_short(stresstesting.MantidStressTest):
return ('SNAP_34172_2_4_Grouping_nor','SNAP_34172_2_4_Grouping_nor.nxs')
-class SNAP_short_detcal(stresstesting.MantidStressTest):
+class SNAP_short_detcal(systemtesting.MantidSystemTest):
def skipTests(self):
return _skip_test()
diff --git a/Testing/SystemTests/tests/analysis/SNSConvertToMDTest.py b/Testing/SystemTests/tests/analysis/SNSConvertToMDTest.py
index 3201adb9a3cc59db3d51fe78708e47b78e7e4a3b..079d2913089515ce0cdfe868f2ea4ad6a3a5db4a 100644
--- a/Testing/SystemTests/tests/analysis/SNSConvertToMDTest.py
+++ b/Testing/SystemTests/tests/analysis/SNSConvertToMDTest.py
@@ -6,7 +6,7 @@
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=invalid-name,no-init
from __future__ import (absolute_import, division, print_function)
-import stresstesting
+import systemtesting
from mantid.simpleapi import *
######################################################################
@@ -118,7 +118,7 @@ def validateMD(result,reference,tol=1.e-5,class_name='dummy',mismatchName=None):
return True
-class SNSConvertToMDNoHistNoProjTest(stresstesting.MantidStressTest):
+class SNSConvertToMDNoHistNoProjTest(systemtesting.MantidSystemTest):
truth_file = "SEQ_11499_md_enp.nxs"
output_ws=None
tolerance=0.0
@@ -143,7 +143,7 @@ class SNSConvertToMDNoHistNoProjTest(stresstesting.MantidStressTest):
return validateMD(self.output_ws, self.gold_ws_name,self.tolerance,self.__class__.__name__)
-class SNSConvertToMDHistNoProjTest(stresstesting.MantidStressTest):
+class SNSConvertToMDHistNoProjTest(systemtesting.MantidSystemTest):
truth_file = "SEQ_11499_md_hnp.nxs"
output_ws=None
tolerance=0.0
@@ -169,7 +169,7 @@ class SNSConvertToMDHistNoProjTest(stresstesting.MantidStressTest):
return validateMD(self.output_ws, self.gold_ws_name,self.tolerance,self.__class__.__name__,self.gold_ws_name)
-class SNSConvertToMDNoHistProjTest(stresstesting.MantidStressTest):
+class SNSConvertToMDNoHistProjTest(systemtesting.MantidSystemTest):
truth_file = "SEQ_11499_md_ewp.nxs"
output_ws=None
tolerance=0.0
@@ -195,7 +195,7 @@ class SNSConvertToMDNoHistProjTest(stresstesting.MantidStressTest):
#return (self.output_ws, self.gold_ws_name)
-class SNSConvertToMDHistProjTest(stresstesting.MantidStressTest):
+class SNSConvertToMDHistProjTest(systemtesting.MantidSystemTest):
truth_file = "SEQ_11499_md_hwp.nxs"
output_ws=None
tolerance=0.0
diff --git a/Testing/SystemTests/tests/analysis/SNSPowderRedux.py b/Testing/SystemTests/tests/analysis/SNSPowderRedux.py
index 140f417c3fc6a76900c956aec96c9f21c2c00190..65b6d57343e40258f1713dfb580df749944b5f50 100644
--- a/Testing/SystemTests/tests/analysis/SNSPowderRedux.py
+++ b/Testing/SystemTests/tests/analysis/SNSPowderRedux.py
@@ -5,7 +5,7 @@
# & Institut Laue - Langevin
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init,invalid-name,attribute-defined-outside-init
-import stresstesting
+import systemtesting
from mantid.simpleapi import *
from mantid.api import FileFinder
@@ -45,7 +45,7 @@ def do_cleanup():
return True
-class PG3Analysis(stresstesting.MantidStressTest):
+class PG3Analysis(systemtesting.MantidSystemTest):
ref_file = 'PG3_4844_reference.gsa'
cal_file = "PG3_FERNS_d4832_2011_08_24.cal"
char_file = "PG3_characterization_2011_08_31-HR.txt"
@@ -90,7 +90,7 @@ class PG3Analysis(stresstesting.MantidStressTest):
return ('PG3_4844','PG3_4844_golden')
-class PG3StripPeaks(stresstesting.MantidStressTest):
+class PG3StripPeaks(systemtesting.MantidSystemTest):
ref_file = 'PG3_4866_reference.gsa'
cal_file = "PG3_FERNS_d4832_2011_08_24.cal"
@@ -196,7 +196,7 @@ class PG3StripPeaks(stresstesting.MantidStressTest):
return ('PG3_4866','PG3_4866_golden')
-class SeriesAndConjoinFilesTest(stresstesting.MantidStressTest):
+class SeriesAndConjoinFilesTest(systemtesting.MantidSystemTest):
cal_file = "PG3_FERNS_d4832_2011_08_24.cal"
char_file = "PG3_characterization_2012_02_23-HR-ILL.txt"
ref_files = ['PG3_9829_reference.gsa', 'PG3_9830_reference.gsa']
@@ -254,7 +254,7 @@ class SeriesAndConjoinFilesTest(stresstesting.MantidStressTest):
return ('PG3_9829','PG3_9829_golden', 'PG3_9830','PG3_9830_golden')
-class SumFilesTest(stresstesting.MantidStressTest):
+class SumFilesTest(systemtesting.MantidSystemTest):
cal_file = "PG3_FERNS_d4832_2011_08_24.cal"
char_file = "PG3_characterization_2012_02_23-HR-ILL.txt"
ref_file = 'PG3_9829_sum_reference.gsa'
@@ -300,7 +300,7 @@ class SumFilesTest(stresstesting.MantidStressTest):
return ('PG3_9829','PG3_9829_golden')
-class ToPDFgetNTest(stresstesting.MantidStressTest):
+class ToPDFgetNTest(systemtesting.MantidSystemTest):
cal_file = "PG3_FERNS_d4832_2011_08_24.cal"
char_file = "PG3_characterization_2012_02_23-HR-ILL.txt"
data_file = "PG3_9829_event.nxs"
diff --git a/Testing/SystemTests/tests/analysis/SXDAnalysis.py b/Testing/SystemTests/tests/analysis/SXDAnalysis.py
index 95bacffbe74c76a37572e703d72f797c631ce373..e4540228de4f55ac58850dda4c480360c81f18a2 100644
--- a/Testing/SystemTests/tests/analysis/SXDAnalysis.py
+++ b/Testing/SystemTests/tests/analysis/SXDAnalysis.py
@@ -6,11 +6,11 @@
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init,invalid-name
from __future__ import (absolute_import, division, print_function)
-import stresstesting
+import systemtesting
from mantid.simpleapi import *
-class SXDAnalysis(stresstesting.MantidStressTest):
+class SXDAnalysis(systemtesting.MantidSystemTest):
"""
Start of a system test for SXD data analyiss
"""
diff --git a/Testing/SystemTests/tests/analysis/SaveLoadNexusProcessed.py b/Testing/SystemTests/tests/analysis/SaveLoadNexusProcessed.py
index f2b673673af482a76ede56c90db4c41b4004c2c6..e64aaffca29f7c9a747007fbdd9f62c74916bbb9 100644
--- a/Testing/SystemTests/tests/analysis/SaveLoadNexusProcessed.py
+++ b/Testing/SystemTests/tests/analysis/SaveLoadNexusProcessed.py
@@ -5,7 +5,7 @@
# & Institut Laue - Langevin
# SPDX - License - Identifier: GPL - 3.0 +
import os
-import stresstesting
+import systemtesting
from mantid.simpleapi import *
from mantid import config
@@ -18,7 +18,7 @@ def create_file_name(base_name):
return filename
-class SaveLoadNexusProcessedTest(stresstesting.MantidStressTest):
+class SaveLoadNexusProcessedTest(systemtesting.MantidSystemTest):
filename = create_file_name('tmp_saveload_nexusprocessed')
diff --git a/Testing/SystemTests/tests/analysis/SingleCrystalDiffuseReductionTest.py b/Testing/SystemTests/tests/analysis/SingleCrystalDiffuseReductionTest.py
index fe6a11fb7398b22b21ec5eff7e7d5c36fbf5aed7..466851fe4199452fc1e3efb6911bfc07366d93db 100644
--- a/Testing/SystemTests/tests/analysis/SingleCrystalDiffuseReductionTest.py
+++ b/Testing/SystemTests/tests/analysis/SingleCrystalDiffuseReductionTest.py
@@ -4,11 +4,11 @@
# NScD Oak Ridge National Laboratory, European Spallation Source
# & Institut Laue - Langevin
# SPDX - License - Identifier: GPL - 3.0 +
-import stresstesting
+import systemtesting
from mantid.simpleapi import SingleCrystalDiffuseReduction, Load, AlgorithmManager, SaveMD
-class SingleCrystalDiffuseTest(stresstesting.MantidStressTest):
+class SingleCrystalDiffuseTest(systemtesting.MantidSystemTest):
def requiredFiles(self):
return ["CORELLI_29782.nxs","CORELLI_29792.nxs",
"SingleCrystalDiffuseReduction_SA.nxs",
diff --git a/Testing/SystemTests/tests/analysis/SortHKLTest.py b/Testing/SystemTests/tests/analysis/SortHKLTest.py
index 18fd0550a969ac48f69c38e4a663b3f5badbb2ff..82dfd93a934245874e8946fe6dbd3a25bf0e4dd8 100644
--- a/Testing/SystemTests/tests/analysis/SortHKLTest.py
+++ b/Testing/SystemTests/tests/analysis/SortHKLTest.py
@@ -6,7 +6,7 @@
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=no-init,attribute-defined-outside-init
from __future__ import (absolute_import, division, print_function)
-import stresstesting
+import systemtesting
import json
from mantid.simpleapi import *
from mantid.geometry import PointGroupFactory
@@ -85,7 +85,7 @@ class HKLStatisticsTestMixin(object):
return overall_statistics
-class SortHKLTest(HKLStatisticsTestMixin, stresstesting.MantidStressTest):
+class SortHKLTest(HKLStatisticsTestMixin, systemtesting.MantidSystemTest):
''' System test for SortHKL
This system test compares some of the output of SortHKL to statistics produced
diff --git a/Testing/SystemTests/tests/analysis/SpaceGroupFactoryTest.py b/Testing/SystemTests/tests/analysis/SpaceGroupFactoryTest.py
index c7efb2f34e0c640fc232b1d5c489761b77434e3a..156a9757aaf99beb5ba144042876efdfa7dbf83e 100644
--- a/Testing/SystemTests/tests/analysis/SpaceGroupFactoryTest.py
+++ b/Testing/SystemTests/tests/analysis/SpaceGroupFactoryTest.py
@@ -6,13 +6,13 @@
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=no-init
from __future__ import (absolute_import, division, print_function)
-import stresstesting
+import systemtesting
import re
from mantid.simpleapi import *
from mantid.geometry import *
-class SpaceGroupFactoryTest(stresstesting.MantidStressTest):
+class SpaceGroupFactoryTest(systemtesting.MantidSystemTest):
'''Check that the space groups generated by Mantid are correct.'''
spaceGroupData = None
diff --git a/Testing/SystemTests/tests/analysis/SpaceGroupReflectionConditionsTest.py b/Testing/SystemTests/tests/analysis/SpaceGroupReflectionConditionsTest.py
index 82dc27602cbfbbe1cc36f0b07d6d49fe90fe5b7b..5476bdb8c47ccb109239c2c9e6dcc46ec978d182 100644
--- a/Testing/SystemTests/tests/analysis/SpaceGroupReflectionConditionsTest.py
+++ b/Testing/SystemTests/tests/analysis/SpaceGroupReflectionConditionsTest.py
@@ -6,13 +6,13 @@
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=no-init,invalid-name
from __future__ import (absolute_import, division, print_function)
-import stresstesting
+import systemtesting
from mantid.simpleapi import *
from mantid.geometry import *
from six import iteritems
-class SpaceGroupReflectionConditionsTest(stresstesting.MantidStressTest):
+class SpaceGroupReflectionConditionsTest(systemtesting.MantidSystemTest):
'''
This test uses PoldiCreatePeaksFromCell to generate lists of reflections for fake crystal structures, one for each
registered space group and one atom in the general position. The algorithm uses structure factor calculation for
diff --git a/Testing/SystemTests/tests/analysis/SpaceGroupUnitCellTest.py b/Testing/SystemTests/tests/analysis/SpaceGroupUnitCellTest.py
index 888bb3d0f2e128487187b64896cfdbb0bdf8b362..1bb2592af28ea1dbc112835aa5200c192ff587bc 100644
--- a/Testing/SystemTests/tests/analysis/SpaceGroupUnitCellTest.py
+++ b/Testing/SystemTests/tests/analysis/SpaceGroupUnitCellTest.py
@@ -6,12 +6,12 @@
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=no-init,invalid-name
from __future__ import (absolute_import, division, print_function)
-import stresstesting
+import systemtesting
from mantid.geometry import *
from six import iteritems
-class SpaceGroupUnitCellTest(stresstesting.MantidStressTest):
+class SpaceGroupUnitCellTest(systemtesting.MantidSystemTest):
'''
This test checks that SpaceGroup.isAllowedUnitCell produces the expected result for each registered space group.
'''
diff --git a/Testing/SystemTests/tests/analysis/SphinxWarnings.py b/Testing/SystemTests/tests/analysis/SphinxWarnings.py
index 7a5d45dc703a4f05b83378e3b7b8de98cfef03a2..80381eca225db7ce22c08a3bf95f928bb0e60c0a 100644
--- a/Testing/SystemTests/tests/analysis/SphinxWarnings.py
+++ b/Testing/SystemTests/tests/analysis/SphinxWarnings.py
@@ -11,15 +11,15 @@ This test tries to detect the most common such errors.
It also detects if a new category is created (i.e. someone uses Utilities instead of Utility)
"""
from __future__ import (absolute_import, division, print_function)
-import stresstesting
+import systemtesting
import mantid
import re
from six import iteritems
-class SphinxWarnings(stresstesting.MantidStressTest):
+class SphinxWarnings(systemtesting.MantidSystemTest):
def __init__(self):
- stresstesting.MantidStressTest.__init__(self)
+ systemtesting.MantidSystemTest.__init__(self)
self.allowedCategories=['Arithmetic',
'CorrectionFunctions',
'Crystal',
diff --git a/Testing/SystemTests/tests/analysis/SplineSmoothingTest.py b/Testing/SystemTests/tests/analysis/SplineSmoothingTest.py
index f9531e7f0d0cf6d73c5d0f476db20a3dda35c7c1..dca4a269460bf3262a88920ab075bcf1986f5d80 100644
--- a/Testing/SystemTests/tests/analysis/SplineSmoothingTest.py
+++ b/Testing/SystemTests/tests/analysis/SplineSmoothingTest.py
@@ -6,7 +6,7 @@
# SPDX - License - Identifier: GPL - 3.0 +
# pylint: disable=no-init,attribute-defined-outside-init,too-many-public-methods
-import stresstesting
+import systemtesting
from mantid.simpleapi import *
from mantid.api import *
import unittest
@@ -14,7 +14,7 @@ import unittest
DIFF_PLACES = 7
-class SplineSmoothingTest(stresstesting.MantidStressTest):
+class SplineSmoothingTest(systemtesting.MantidSystemTest):
def requiredFiles(self):
return set(["Stheta.nxs", "ENGINX_precalculated_vanadium_run000236516_bank_curves.nxs"])
diff --git a/Testing/SystemTests/tests/analysis/StepScan.py b/Testing/SystemTests/tests/analysis/StepScan.py
index ce59b01ab13306038c9814c8c9810f70deb304b5..e29c26b828d6635b65674868e860f2ea11d5ff5f 100644
--- a/Testing/SystemTests/tests/analysis/StepScan.py
+++ b/Testing/SystemTests/tests/analysis/StepScan.py
@@ -5,11 +5,11 @@
# & Institut Laue - Langevin
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init
-import stresstesting
+import systemtesting
from mantid.simpleapi import *
-class StepScanWorkflowAlgorithm(stresstesting.MantidStressTest):
+class StepScanWorkflowAlgorithm(systemtesting.MantidSystemTest):
'''Tests the StepScan workflow algorithm'''
def runTest(self):
diff --git a/Testing/SystemTests/tests/analysis/TOPAZPeakFinding.py b/Testing/SystemTests/tests/analysis/TOPAZPeakFinding.py
index f2b2a8fdcce29dc6d1aa27fbcd46c3d2a37c5801..71132d6d154c79fe111062d8d45180891174e609 100644
--- a/Testing/SystemTests/tests/analysis/TOPAZPeakFinding.py
+++ b/Testing/SystemTests/tests/analysis/TOPAZPeakFinding.py
@@ -11,12 +11,12 @@ converts to Q space, finds peaks and indexes
them.
"""
from __future__ import (absolute_import, division, print_function)
-import stresstesting
+import systemtesting
import numpy
from mantid.simpleapi import *
-class TOPAZPeakFinding(stresstesting.MantidStressTest):
+class TOPAZPeakFinding(systemtesting.MantidSystemTest):
def requiredMemoryMB(self):
""" Require about 2GB free """
diff --git a/Testing/SystemTests/tests/analysis/TobyFitResolutionSimulationTest.py b/Testing/SystemTests/tests/analysis/TobyFitResolutionSimulationTest.py
index 7b566a1880c8566dd5cec6c94073e574181edc33..0fdc6561792bfc740158be0fdcf06c77b50fa6dc 100644
--- a/Testing/SystemTests/tests/analysis/TobyFitResolutionSimulationTest.py
+++ b/Testing/SystemTests/tests/analysis/TobyFitResolutionSimulationTest.py
@@ -8,7 +8,7 @@
"""Testing of the VATES quantification using
the TobyFitResolutionModel
"""
-from stresstesting import MantidStressTest
+from systemtesting import MantidSystemTest
from mantid.simpleapi import *
@@ -24,7 +24,7 @@ def create_cuboid_xml(xlength,ylength,zlength):
return xml % {"xpt": xlength/2.0,"ypt":ylength/2.0,"zpt":zlength/2.0}
-class TobyFitResolutionSimulationTest(MantidStressTest):
+class TobyFitResolutionSimulationTest(MantidSystemTest):
_success = False
diff --git a/Testing/SystemTests/tests/analysis/UnweightedLeastSquaresTest.py b/Testing/SystemTests/tests/analysis/UnweightedLeastSquaresTest.py
index e04c5578bc4fd74b5efac351018cb0c529ce05ff..3761dd6679a42d29f7d23aa43c5411a303de04f4 100644
--- a/Testing/SystemTests/tests/analysis/UnweightedLeastSquaresTest.py
+++ b/Testing/SystemTests/tests/analysis/UnweightedLeastSquaresTest.py
@@ -9,7 +9,7 @@
# These system test perform some of the fits provided by NIST for non-linear
# least square systems that can be found here:
# http://www.itl.nist.gov/div898/strd/nls/nls_main.shtml
-import stresstesting
+import systemtesting
from mantid.simpleapi import *
@@ -28,7 +28,7 @@ def runFit(x, y, fn):
return params, errors
-class LeastSquaresNISTRat43Test(stresstesting.MantidStressTest):
+class LeastSquaresNISTRat43Test(systemtesting.MantidSystemTest):
def runTest(self):
x = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15]
y = [16.08, 33.83, 65.8, 97.2, 191.55, 326.2, 386.87, 520.53, 590.03, 651.92, 724.93, 699.56, 689.96, 637.56,
@@ -48,7 +48,7 @@ class LeastSquaresNISTRat43Test(stresstesting.MantidStressTest):
self.assertDelta(val / expected - 1.0, 0.0, 3e-3)
-class LeastSquaresNISTGauss3Test(stresstesting.MantidStressTest):
+class LeastSquaresNISTGauss3Test(systemtesting.MantidSystemTest):
def runTest(self):
x = [1.000000, 2.000000, 3.000000, 4.000000, 5.000000, 6.000000, 7.000000, 8.000000, 9.000000, 10.000000,
11.00000, 12.00000, 13.00000, 14.00000, 15.00000, 16.00000, 17.00000, 18.00000, 19.00000, 20.00000,
@@ -119,7 +119,7 @@ class LeastSquaresNISTGauss3Test(stresstesting.MantidStressTest):
self.assertDelta(val / expected - 1.0, 0.0, 2e-5)
-class LeastSquaresNISTMGH09Test(stresstesting.MantidStressTest):
+class LeastSquaresNISTMGH09Test(systemtesting.MantidSystemTest):
def runTest(self):
x = [4.000000E+00, 2.000000E+00, 1.000000E+00, 5.000000E-01, 2.500000E-01, 1.670000E-01, 1.250000E-01,
1.000000E-01, 8.330000E-02, 7.140000E-02, 6.250000E-02]
diff --git a/Testing/SystemTests/tests/analysis/ValidateFacilitiesFile.py b/Testing/SystemTests/tests/analysis/ValidateFacilitiesFile.py
index 592a4f700ece6d303c5a789620613f73a96d7775..df511c193dada8a86ecc32843cacf87d58de6778 100644
--- a/Testing/SystemTests/tests/analysis/ValidateFacilitiesFile.py
+++ b/Testing/SystemTests/tests/analysis/ValidateFacilitiesFile.py
@@ -8,13 +8,13 @@
from __future__ import (absolute_import, division, print_function)
from mantid import config
import os
-import stresstesting
+import systemtesting
EXPECTED_EXT = '.expected'
-class ValidateFacilitiesFile(stresstesting.MantidStressTest):
+class ValidateFacilitiesFile(systemtesting.MantidSystemTest):
def skipTests(self):
try:
diff --git a/Testing/SystemTests/tests/analysis/ValidateGroupingFiles.py b/Testing/SystemTests/tests/analysis/ValidateGroupingFiles.py
index 393c93a6e9e29d72b8d0f816c51e751963cd9262..c1e72fc4e27c3891c04fc6d52f3182ad51e889f8 100644
--- a/Testing/SystemTests/tests/analysis/ValidateGroupingFiles.py
+++ b/Testing/SystemTests/tests/analysis/ValidateGroupingFiles.py
@@ -8,13 +8,13 @@
from __future__ import (absolute_import, division, print_function)
from mantid import config
import os
-import stresstesting
+import systemtesting
import glob
EXPECTED_EXT = '.expected'
-class ValidateGroupingFiles(stresstesting.MantidStressTest):
+class ValidateGroupingFiles(systemtesting.MantidSystemTest):
xsdFile =''
diff --git a/Testing/SystemTests/tests/analysis/ValidateInstrumentDefinitionFiles.py b/Testing/SystemTests/tests/analysis/ValidateInstrumentDefinitionFiles.py
index f82880cf6a86990dcfd82edde9eb037a1b010cf0..0f68e5f18086381b618323d457327c6a7b911992 100644
--- a/Testing/SystemTests/tests/analysis/ValidateInstrumentDefinitionFiles.py
+++ b/Testing/SystemTests/tests/analysis/ValidateInstrumentDefinitionFiles.py
@@ -9,14 +9,14 @@
from __future__ import (absolute_import, division, print_function)
from mantid import config
import os
-import stresstesting
+import systemtesting
import glob
EXPECTED_EXT = '.expected'
-class ValidateInstrumentDefinitionFiles(stresstesting.MantidStressTest):
+class ValidateInstrumentDefinitionFiles(systemtesting.MantidSystemTest):
xsdFile=''
# Explicitly specify single file to test. If None, test all.
diff --git a/Testing/SystemTests/tests/analysis/ValidateParameterFiles.py b/Testing/SystemTests/tests/analysis/ValidateParameterFiles.py
index 0bc4751c7cfc7b07a9e1b586f3dc9b86ac8b6fee..016fb9400aad6fe04f402ace52bf34195c2482a2 100644
--- a/Testing/SystemTests/tests/analysis/ValidateParameterFiles.py
+++ b/Testing/SystemTests/tests/analysis/ValidateParameterFiles.py
@@ -8,13 +8,13 @@
from __future__ import (absolute_import, division, print_function)
from mantid import config
import os
-import stresstesting
+import systemtesting
import glob
EXPECTED_EXT = '.expected'
-class ValidateParameterFiles(stresstesting.MantidStressTest):
+class ValidateParameterFiles(systemtesting.MantidSystemTest):
xsdFile=''
diff --git a/Testing/SystemTests/tests/analysis/VesuvioCommandsTest.py b/Testing/SystemTests/tests/analysis/VesuvioCommandsTest.py
index 0da9d6fadba7c8778d65e7e7c4cc7f8f6e1c8234..225bbf999c9ec6f51d13b27b427727fd88ebd7e9 100644
--- a/Testing/SystemTests/tests/analysis/VesuvioCommandsTest.py
+++ b/Testing/SystemTests/tests/analysis/VesuvioCommandsTest.py
@@ -8,7 +8,7 @@
"""These are more integration tests as they will require that the test data is available
and that mantid can be imported
"""
-import stresstesting
+import systemtesting
import numpy as np
from mantid.api import (WorkspaceGroup, MatrixWorkspace)
@@ -162,7 +162,7 @@ def load_and_crop_data(runs, spectra, ip_file, diff_mode='single',
# ====================================================================================
-class FitSingleSpectrumNoBackgroundTest(stresstesting.MantidStressTest):
+class FitSingleSpectrumNoBackgroundTest(systemtesting.MantidSystemTest):
_fit_results = None
def runTest(self):
@@ -213,7 +213,7 @@ class FitSingleSpectrumNoBackgroundTest(stresstesting.MantidStressTest):
# ====================================================================================
-class FitSingleSpectrumBivariateGaussianTiesTest(stresstesting.MantidStressTest):
+class FitSingleSpectrumBivariateGaussianTiesTest(systemtesting.MantidSystemTest):
"""
Test ensures that internal ties for mass profiles work correctly
This test ties SigmaX to SigmaY making the multivariate gaussian
@@ -241,7 +241,7 @@ class FitSingleSpectrumBivariateGaussianTiesTest(stresstesting.MantidStressTest)
# ====================================================================================
-class SingleSpectrumBackground(stresstesting.MantidStressTest):
+class SingleSpectrumBackground(systemtesting.MantidSystemTest):
_fit_results = None
def runTest(self):
@@ -294,7 +294,7 @@ class SingleSpectrumBackground(stresstesting.MantidStressTest):
# ====================================================================================
-class BankByBankForwardSpectraNoBackground(stresstesting.MantidStressTest):
+class BankByBankForwardSpectraNoBackground(systemtesting.MantidSystemTest):
_fit_results = None
def runTest(self):
@@ -343,7 +343,7 @@ class BankByBankForwardSpectraNoBackground(stresstesting.MantidStressTest):
# ====================================================================================
-class SpectraBySpectraForwardSpectraNoBackground(stresstesting.MantidStressTest):
+class SpectraBySpectraForwardSpectraNoBackground(systemtesting.MantidSystemTest):
_fit_results = None
def runTest(self):
@@ -392,7 +392,7 @@ class SpectraBySpectraForwardSpectraNoBackground(stresstesting.MantidStressTest)
# ====================================================================================
-class PassPreLoadedWorkspaceToFitTOF(stresstesting.MantidStressTest):
+class PassPreLoadedWorkspaceToFitTOF(systemtesting.MantidSystemTest):
_fit_results = None
def runTest(self):
@@ -439,7 +439,7 @@ class PassPreLoadedWorkspaceToFitTOF(stresstesting.MantidStressTest):
# ====================================================================================
-class CalculateCumulativeAngleAveragedData(stresstesting.MantidStressTest):
+class CalculateCumulativeAngleAveragedData(systemtesting.MantidSystemTest):
_fit_results = None
def runTest(self):
diff --git a/Testing/SystemTests/tests/analysis/VesuvioCorrectionsTest.py b/Testing/SystemTests/tests/analysis/VesuvioCorrectionsTest.py
index 9a6d2a1d0ab9e4bcbbba8e2299358c7a820f477b..85fa6944d5e282e5be459a9d6e94d4e02bf10a92 100644
--- a/Testing/SystemTests/tests/analysis/VesuvioCorrectionsTest.py
+++ b/Testing/SystemTests/tests/analysis/VesuvioCorrectionsTest.py
@@ -13,7 +13,7 @@ Assumes that mantid can be imported and the data paths
are configured to find the Vesuvio data
"""
from __future__ import (absolute_import, division, print_function)
-import stresstesting
+import systemtesting
import numpy as np
from mantid.api import *
@@ -147,7 +147,7 @@ def _create_dummy_profiles():
# ===========================================================================================
# ========================================Success cases======================================
-class TestGammaAndMsCorrectWorkspaceIndexOne(stresstesting.MantidStressTest):
+class TestGammaAndMsCorrectWorkspaceIndexOne(systemtesting.MantidSystemTest):
_algorithm = None
_is_linux = None
_is_rhel6 = None
@@ -203,7 +203,7 @@ class TestGammaAndMsCorrectWorkspaceIndexOne(stresstesting.MantidStressTest):
tear_down()
-class TestGammaAndMsCorrectWorkspaceIndexTwo(stresstesting.MantidStressTest):
+class TestGammaAndMsCorrectWorkspaceIndexTwo(systemtesting.MantidSystemTest):
_algorithm = None
_is_linux = None
_is_rhel6 = None
@@ -260,7 +260,7 @@ class TestGammaAndMsCorrectWorkspaceIndexTwo(stresstesting.MantidStressTest):
tear_down()
-class TestMsCorrectWithContainer(stresstesting.MantidStressTest):
+class TestMsCorrectWithContainer(systemtesting.MantidSystemTest):
_algorithm = None
_input_bins = None
@@ -317,7 +317,7 @@ class TestMsCorrectWithContainer(stresstesting.MantidStressTest):
tear_down()
-class TestGammaAndMsCorrectWithContainer(stresstesting.MantidStressTest):
+class TestGammaAndMsCorrectWithContainer(systemtesting.MantidSystemTest):
_algorithm = None
_input_bins = None
@@ -371,7 +371,7 @@ class TestGammaAndMsCorrectWithContainer(stresstesting.MantidStressTest):
tear_down()
-class TestGammaAndMsCorrectWithContainerFixedScaling(stresstesting.MantidStressTest):
+class TestGammaAndMsCorrectWithContainerFixedScaling(systemtesting.MantidSystemTest):
_algorithm = None
_input_bins = None
@@ -429,7 +429,7 @@ class TestGammaAndMsCorrectWithContainerFixedScaling(stresstesting.MantidStressT
tear_down()
-class TestCorrectionsInBackScatteringSpectra(stresstesting.MantidStressTest):
+class TestCorrectionsInBackScatteringSpectra(systemtesting.MantidSystemTest):
_algorithm = None
_input_bins = None
@@ -498,7 +498,7 @@ class TestCorrectionsInBackScatteringSpectra(stresstesting.MantidStressTest):
# ========================================Failure cases======================================
-class TestRunningWithoutFitParamsRaisesError(stresstesting.MantidStressTest):
+class TestRunningWithoutFitParamsRaisesError(systemtesting.MantidSystemTest):
_algorithm = None
def runTest(self):
@@ -511,7 +511,7 @@ class TestRunningWithoutFitParamsRaisesError(stresstesting.MantidStressTest):
self.assertRaises(RuntimeError, self._algorithm.execute)
-class TestRunningWithoutMassesRaisesError(stresstesting.MantidStressTest):
+class TestRunningWithoutMassesRaisesError(systemtesting.MantidSystemTest):
_algorithm = None
def runTest(self):
@@ -524,7 +524,7 @@ class TestRunningWithoutMassesRaisesError(stresstesting.MantidStressTest):
self.assertRaises(RuntimeError, self._algorithm.execute)
-class TestRunningWithoutProfilesRaisesError(stresstesting.MantidStressTest):
+class TestRunningWithoutProfilesRaisesError(systemtesting.MantidSystemTest):
_algorithm = None
def runTest(self):
diff --git a/Testing/SystemTests/tests/analysis/VesuvioFittingTest.py b/Testing/SystemTests/tests/analysis/VesuvioFittingTest.py
index 0a34485713c2006812b6af965f1fcbfac7581b7a..bd103ccc91a2bfdbac176d13709a5476f4bc9ea2 100644
--- a/Testing/SystemTests/tests/analysis/VesuvioFittingTest.py
+++ b/Testing/SystemTests/tests/analysis/VesuvioFittingTest.py
@@ -5,7 +5,7 @@
# & Institut Laue - Langevin
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=invalid-name,no-init,attribute-defined-outside-init
-import stresstesting
+import systemtesting
from mantid.simpleapi import *
import platform
@@ -77,7 +77,7 @@ def tolerance():
#------------------------------------------------------------------------------------------------------------------
-class VesuvioFittingTest(stresstesting.MantidStressTest):
+class VesuvioFittingTest(systemtesting.MantidSystemTest):
def runTest(self):
do_fit_no_background(k_is_free=False)
@@ -94,7 +94,7 @@ class VesuvioFittingTest(stresstesting.MantidStressTest):
#------------------------------------------------------------------------------------------------------------------
-class VesuvioFittingWithKFreeTest(stresstesting.MantidStressTest):
+class VesuvioFittingWithKFreeTest(systemtesting.MantidSystemTest):
def runTest(self):
do_fit_no_background(k_is_free=True)
@@ -111,7 +111,7 @@ class VesuvioFittingWithKFreeTest(stresstesting.MantidStressTest):
#------------------------------------------------------------------------------------------------------------------
-class VesuvioFittingWithQuadraticBackgroundTest(stresstesting.MantidStressTest):
+class VesuvioFittingWithQuadraticBackgroundTest(systemtesting.MantidSystemTest):
def runTest(self):
do_fit_with_quadratic_background()
diff --git a/Testing/SystemTests/tests/analysis/VesuvioLoadingTest.py b/Testing/SystemTests/tests/analysis/VesuvioLoadingTest.py
index febd0595288249b0573497ba578cf46a6c24e985..b25017bdca73a6c606fc1e446e2245cb8ee3ec3f 100644
--- a/Testing/SystemTests/tests/analysis/VesuvioLoadingTest.py
+++ b/Testing/SystemTests/tests/analysis/VesuvioLoadingTest.py
@@ -8,13 +8,13 @@
"""These are more integration tests as they will require that the test data is available
and that mantid can be imported
"""
-import stresstesting
+import systemtesting
from mantid.api import MatrixWorkspace # mantid must be imported first to set the script paths correctly
from vesuvio.loading import VesuvioLoadHelper, VesuvioTOFFitInput
-class LoadSingleRunSingleSpectrumTest(stresstesting.MantidStressTest):
+class LoadSingleRunSingleSpectrumTest(systemtesting.MantidSystemTest):
_tof_input = None
def runTest(self):
@@ -33,7 +33,7 @@ class LoadSingleRunSingleSpectrumTest(stresstesting.MantidStressTest):
"for spectra field: '" + self._tof_input.spectra + "'.")
-class LoadMultipleRunSingleSpectrumTest(stresstesting.MantidStressTest):
+class LoadMultipleRunSingleSpectrumTest(systemtesting.MantidSystemTest):
_tof_input = None
def runTest(self):
@@ -52,7 +52,7 @@ class LoadMultipleRunSingleSpectrumTest(stresstesting.MantidStressTest):
"for spectra field: '" + self._tof_input.spectra + "'.")
-class LoadMultipleRunMultipleSpectrumTest(stresstesting.MantidStressTest):
+class LoadMultipleRunMultipleSpectrumTest(systemtesting.MantidSystemTest):
_tof_input = None
def runTest(self):
@@ -71,7 +71,7 @@ class LoadMultipleRunMultipleSpectrumTest(stresstesting.MantidStressTest):
"but found different value for spectra field: '" + self._tof_input.spectra + "'.")
-class LoadBackScatteringSpectrumTest(stresstesting.MantidStressTest):
+class LoadBackScatteringSpectrumTest(systemtesting.MantidSystemTest):
_tof_input = None
def runTest(self):
diff --git a/Testing/SystemTests/tests/analysis/WeightedLeastSquaresTest.py b/Testing/SystemTests/tests/analysis/WeightedLeastSquaresTest.py
index cc187f2da82e62ae3c49ea217086b6263ba62a59..7b8efe3b3c862ca6f2790d3e0b5cd9bb78d7496e 100644
--- a/Testing/SystemTests/tests/analysis/WeightedLeastSquaresTest.py
+++ b/Testing/SystemTests/tests/analysis/WeightedLeastSquaresTest.py
@@ -24,7 +24,7 @@
# made available to Mantid users)
#
-import stresstesting
+import systemtesting
from mantid.simpleapi import *
from mantid.api import MatrixWorkspace
@@ -246,7 +246,7 @@ class VanadiumPatternFromENGINXSmoothing(unittest.TestCase):
compare_relative_errors(fitted_params, expected_params, tolerance=1e-4)
-class WeightedLeastSquaresTest(stresstesting.MantidStressTest):
+class WeightedLeastSquaresTest(systemtesting.MantidSystemTest):
_success = False
diff --git a/Testing/SystemTests/tests/analysis/WishAnalysis.py b/Testing/SystemTests/tests/analysis/WishAnalysis.py
index 89d83b274b91b78354504d486f3bd10454e7fd46..dc4047d0e0e384df00222a8344eca052d189b0c6 100644
--- a/Testing/SystemTests/tests/analysis/WishAnalysis.py
+++ b/Testing/SystemTests/tests/analysis/WishAnalysis.py
@@ -5,11 +5,11 @@
# & Institut Laue - Langevin
# SPDX - License - Identifier: GPL - 3.0 +
#pylint: disable=no-init
-import stresstesting
+import systemtesting
from mantid.simpleapi import *
-class WishAnalysis(stresstesting.MantidStressTest):
+class WishAnalysis(systemtesting.MantidSystemTest):
"""
Runs the WISH analysis chain on one bank of data
"""
diff --git a/Testing/SystemTests/tests/analysis/WishCalibrate.py b/Testing/SystemTests/tests/analysis/WishCalibrate.py
index 371084e72679af17af38553e9004af633869a583..8c5d27cad3d779bd9f685ac0949c16c7da1bec01 100644
--- a/Testing/SystemTests/tests/analysis/WishCalibrate.py
+++ b/Testing/SystemTests/tests/analysis/WishCalibrate.py
@@ -8,7 +8,7 @@ from __future__ import (absolute_import, division, print_function)
import filecmp
import numpy as np
import os
-import stresstesting
+import systemtesting
import tempfile
import mantid.simpleapi as mantid
@@ -21,7 +21,7 @@ from ideal_tube import IdealTube
import tube
-class WishCalibration(stresstesting.MantidStressTest):
+class WishCalibration(systemtesting.MantidSystemTest):
"""
Runs the WISH calibration script and checks the result produced is sane
"""
diff --git a/Testing/SystemTests/tests/analysis/WishDiffuseScattering.py b/Testing/SystemTests/tests/analysis/WishDiffuseScattering.py
index 954de43b84f7f989205d1973f150cde69e024035..9a8a54ea5a3f3b729aa37f35fea7487812494256 100644
--- a/Testing/SystemTests/tests/analysis/WishDiffuseScattering.py
+++ b/Testing/SystemTests/tests/analysis/WishDiffuseScattering.py
@@ -11,11 +11,11 @@ If this breaks for whatever reason, there is a good chance that unregistered scr
- Email Pascal Manuel @ ISIS if things break here and let him know how his scripts may need to be modified.
"""
-import stresstesting
+import systemtesting
from mantid.simpleapi import *
-class WishDiffuseScattering(stresstesting.MantidStressTest):
+class WishDiffuseScattering(systemtesting.MantidSystemTest):
def requiredMemoryMB(self):
return 2000
diff --git a/Testing/SystemTests/tests/analysis/WishMasking.py b/Testing/SystemTests/tests/analysis/WishMasking.py
index 17848b9c7888a3b2c8b2597e2c4f522d8d48dc0f..5c69a29d757bed84ef1764271dff9072eb3fd795 100644
--- a/Testing/SystemTests/tests/analysis/WishMasking.py
+++ b/Testing/SystemTests/tests/analysis/WishMasking.py
@@ -11,12 +11,12 @@ Tests masking functionality specific to WISH. Working masking behaviour is criti
"""
from __future__ import (absolute_import, division, print_function)
-import stresstesting
+import systemtesting
import os
from mantid.simpleapi import *
-class WishMasking(stresstesting.MantidStressTest):
+class WishMasking(systemtesting.MantidSystemTest):
# Utility function will return the masking corresponding to a workspace index from a cal file.
def get_masking_for_index(self, cal_file, requested_index):
diff --git a/dev-docs/source/SystemTests.rst b/dev-docs/source/SystemTests.rst
index 7a2c8cf3dacbdfbe23f2e8fbfef0c59f0c56fd21..8fc31454af7ecd0b3c1034c52c259f8d5e2a83d2 100644
--- a/dev-docs/source/SystemTests.rst
+++ b/dev-docs/source/SystemTests.rst
@@ -28,18 +28,16 @@ repository at
`mantidproject/mantid <http://github.com/mantidproject/mantid>`__, under
the ``Testing/SystemTests`` directory.
-Like their 'stress' equivalents (`stress testing <Stress_Tests>`__),
-system tests inherit from the stresstesting.MantidStressTest class. The
-methods that need to be overridden are ``runTest(self)``, where the
-python code that runs the test should be placed, and ``validate(self)``,
-which should simply return a pair of strings: the name of the final
-workspace that results from the ``runTest`` method and the name of a
-nexus file that should be saved in the ReferenceResults sub-directory in
-the repository. The test code itself is likely to be the output of a
-*Save History* command, though it can be any python code. In the
-unlikely case of files being used during a system test, implement the
-method ``requiredFiles`` which should return a list of filenames without
-paths. The file to validate against should be included as well. If any
+System tests inherit from the :class:`systemtesting.MantidSystemTest` class.
+The methods that need to be overridden are ``runTest(self)``, where the python
+code that runs the test should be placed, and ``validate(self)``, which should
+simply return a pair of strings: the name of the final workspace that results
+from the ``runTest`` method and the name of a nexus file that should be saved
+in the ReferenceResults sub-directory in the repository. The test code itself
+is likely to be the output of a *Save History* command, though it can be any
+python code. In the unlikely case of files being used during a system test,
+implement the method ``requiredFiles`` which should return a list of filenames
+without paths. The file to validate against should be included as well. If any
of those files are missing the test will be marked as skipped.
The tests should be added to the ``Testing/SystemTests/tests/analysis``,
diff --git a/dev-docs/source/Testing/ErrorReporter-ProjectRecovery/ErrorReporterTesting.rst b/dev-docs/source/Testing/ErrorReporter-ProjectRecovery/ErrorReporterTesting.rst
index 550f6205137385916b657f3027923b19f3f37457..1a9dff9fa8e7cc086bac4882bb4770341aa55c74 100644
--- a/dev-docs/source/Testing/ErrorReporter-ProjectRecovery/ErrorReporterTesting.rst
+++ b/dev-docs/source/Testing/ErrorReporter-ProjectRecovery/ErrorReporterTesting.rst
@@ -102,6 +102,3 @@ Error Reporter test
- Click the `Yes, share information` box
- Mantid should shut down
- Check with the database admin
-
----------------
-
diff --git a/dev-docs/source/Widgets/Plotting.rst b/dev-docs/source/Widgets/Plotting.rst
index 68ffb0606a35879536c4d8f9c9bdd0d5388cc210..433e9d73f9aeee250a160b4d929bc68acd6a879a 100644
--- a/dev-docs/source/Widgets/Plotting.rst
+++ b/dev-docs/source/Widgets/Plotting.rst
@@ -90,6 +90,7 @@ Exposes required functions from ``plotting_view.py``.
:raises KeyError: if the subplot name doesn't exist
"""
return self.view.get_subplot(name)
+
*Functions should only be exposed if they are necessary for use with the plotting interface.*
Plotting View
@@ -131,6 +132,7 @@ Related Bugs/Notes
AxisChanger
^^^^^^^^^^^
-``AxisChanger`` is a small widget comprising of two ``QLineEdit``s in a neat format,
+
+``AxisChanger`` is a small widget comprising of two ``QLineEdit`` widgets in a neat format,
with events exposed for x/y limit changing. This functionality is inherently separate
to that of the plotting, so the AxisChanger module is separate (albeit enclosed within) the plotting.