Skip to content
Snippets Groups Projects
Commit ac9b8e48 authored by Conor Finn's avatar Conor Finn
Browse files

RE #27722 Fix removal of systemtest inheritance

Accidentally removed inheritance of systemtesting.MantidSystemTest when
removing with_metaclass and add_metaclass. Put them back.
parent 5a6f9f41
No related branches found
No related tags found
No related merge requests found
...@@ -82,7 +82,7 @@ from mantid.api import FileFinder ...@@ -82,7 +82,7 @@ from mantid.api import FileFinder
from systemtesting import MantidSystemTest, using_gsl_v1 from systemtesting import MantidSystemTest, using_gsl_v1
class ISISIndirectInelasticBase(metaclass=ABCMeta): class ISISIndirectInelasticBase(MantidSystemTest, metaclass=ABCMeta):
''' '''
A common base class for the ISISIndirectInelastic* base classes. A common base class for the ISISIndirectInelastic* base classes.
''' '''
......
...@@ -13,7 +13,7 @@ from abc import ABCMeta, abstractmethod ...@@ -13,7 +13,7 @@ from abc import ABCMeta, abstractmethod
#---------------------------------------------------------------------- #----------------------------------------------------------------------
class ISISMuonAnalysis(metaclass=ABCMeta): class ISISMuonAnalysis(systemtesting.MantidSystemTest, metaclass=ABCMeta):
"""A base class for the ISIS Muon Analysis tests """A base class for the ISIS Muon Analysis tests
The workflow is defined in the runTest() method, simply The workflow is defined in the runTest() method, simply
......
...@@ -12,7 +12,7 @@ from abc import ABCMeta, abstractmethod ...@@ -12,7 +12,7 @@ from abc import ABCMeta, abstractmethod
#---------------------------------------------------------------------- #----------------------------------------------------------------------
class ISISMuonAnalysisGrouping(metaclass=ABCMeta): class ISISMuonAnalysisGrouping(systemtesting.MantidSystemTest, metaclass=ABCMeta):
"""A base class for the ISIS Muon Analysis tests """A base class for the ISIS Muon Analysis tests
The workflow is defined in the runTest() method, simply The workflow is defined in the runTest() method, simply
......
...@@ -15,7 +15,7 @@ import os ...@@ -15,7 +15,7 @@ import os
from abc import ABCMeta, abstractmethod from abc import ABCMeta, abstractmethod
class ISISReflInstrumentIDFTest(metaclass=ABCMeta): class ISISReflInstrumentIDFTest(systemtesting.MantidSystemTest, metaclass=ABCMeta):
@abstractmethod @abstractmethod
def get_IDF_name(self): def get_IDF_name(self):
......
...@@ -16,7 +16,7 @@ import mantid.api ...@@ -16,7 +16,7 @@ import mantid.api
from abc import ABCMeta, abstractmethod from abc import ABCMeta, abstractmethod
class LoadAndCheckBase(metaclass=ABCMeta): class LoadAndCheckBase(systemtesting.MantidSystemTest, metaclass=ABCMeta):
__comparison_out_workspace_name = 'a_integrated' __comparison_out_workspace_name = 'a_integrated'
......
...@@ -15,7 +15,7 @@ from mantid.simpleapi import * ...@@ -15,7 +15,7 @@ from mantid.simpleapi import *
from abc import ABCMeta, abstractmethod from abc import ABCMeta, abstractmethod
class ReflectometryISIS(metaclass=ABCMeta): class ReflectometryISIS(systemtesting.MantidSystemTest, metaclass=ABCMeta):
@abstractmethod @abstractmethod
def get_workspace_name(self): def get_workspace_name(self):
......
...@@ -20,7 +20,7 @@ def create_file_path(base_name): ...@@ -20,7 +20,7 @@ def create_file_path(base_name):
return filename return filename
class SaveLoadNexusProcessedTestBase(metaclass=ABCMeta): class SaveLoadNexusProcessedTestBase(systemtesting.MantidSystemTest, metaclass=ABCMeta):
filename = None filename = None
test_ws_name = 'input_ws' test_ws_name = 'input_ws'
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment