Merge remote branch 'origin/feature/8374_clean_up_tests'

SystemTests/AnalysisTests/CalibrateRectangularDetector_Test.py

@@ -16,6 +16,8 @@ def _skip_test():
         return True
 
 class PG3Calibration(stresstesting.MantidStressTest):
+    def cleanup(self):
+        os.remove(self.saved_cal_file)
 
     def skipTests(self):
         return _skip_test()
@@ -56,6 +58,8 @@ def validate(self):
         return ('PG3_2538_offsets','PG3_2538_golden_offsets')
 
 class PG3CCCalibration(stresstesting.MantidStressTest):
+    def cleanup(self):
+        os.remove(self.saved_cal_file)
 
     def skipTests(self):
         return _skip_test()

SystemTests/AnalysisTests/Diffraction_Workflow_Test.py

@@ -5,8 +5,20 @@
 import stresstesting
 import numpy
 from mantid.simpleapi import *
+from mantid.api import FileFinder
+
+import os
 
 class Diffraction_Workflow_Test(stresstesting.MantidStressTest):
+
+    def cleanup(self):
+        Files = ["TOPAZ_3132.hkl",
+        "TOPAZ_3132FFT.hkl"]
+        for file in Files:
+            absfile = FileFinder.getFullPath(file)
+            if os.path.exists(absfile):
+                os.remove(absfile)
+        return True
 
     def requiredMemoryMB(self):
         """ Require about 4GB free """

SystemTests/AnalysisTests/EQSANSBeamCenterAPIv2.py

@@ -4,7 +4,20 @@
 from reduction_workflow.instruments.sans.sns_command_interface import *
 from mantid.api import *
 
+import os
+
+def do_cleanup():
+    absfile = FileFinder.getFullPath("EQSANS_4061_event_reduction.log")
+    if os.path.exists(absfile):
+        os.remove(absfile)
+    return True
+
 class EQSANSBeamCenter(stresstesting.MantidStressTest):
+
+    def cleanup(self):
+        do_cleanup()
+        return True
+
     def runTest(self):
         config = ConfigService.Instance()
         config["facilityName"]='SNS'
@@ -36,6 +49,11 @@ def validate(self):
         return "EQSANS_4061_event_frame2_Iq", 'EQSANSBeamCenter.nxs'
 
 class EQSANSBeamCenterEvent(EQSANSBeamCenter):
+
+    def cleanup(self):
+        do_cleanup()
+        return True
+
     def runTest(self):
         config = ConfigService.Instance()
         config["facilityName"]='SNS'

SystemTests/AnalysisTests/EQSANSDarkCurrentAPIv2.py

@@ -4,7 +4,16 @@
 from reduction_workflow.instruments.sans.sns_command_interface import *
 from mantid.api import *
 
+import os
+
 class EQSANSDarkCurrent(stresstesting.MantidStressTest):
+
+    def cleanup(self):
+        absfile = FileFinder.getFullPath("EQSANS_1466_event_reduction.log")
+        if os.path.exists(absfile):
+            os.remove(absfile)
+        return True
+
     """
         Analysis Tests for EQSANS
         Testing that the I(Q) output of is correct 

SystemTests/AnalysisTests/EQSANSEffAPIv2.py

@@ -2,8 +2,18 @@
 import mantid
 from mantid.simpleapi import *
 from reduction_workflow.instruments.sans.sns_command_interface import *
+from mantid.api import FileFinder
+
+import os
 
 class EQSANSEff(stresstesting.MantidStressTest):
+
+    def cleanup(self):
+        absfile = FileFinder.getFullPath("EQSANS_1466_event_reduction.log")
+        if os.path.exists(absfile):
+            os.remove(absfile)
+        return True
+
     def runTest(self):
         """
             System test for sensitivity correction

SystemTests/AnalysisTests/EQSANSIQOutputAPIv2.py

@@ -3,8 +3,24 @@
 import mantid
 from mantid.simpleapi import *
 from reduction_workflow.instruments.sans.sns_command_interface import *
+from mantid.api import *
+
+import os
+
+def do_cleanup():
+    Files = ["EQSANS_4061_event_reduction.log",
+    "EQSANS_1466_event_reduction.log"]
+    for file in Files:
+        absfile = FileFinder.getFullPath(file)
+        if os.path.exists(absfile):
+            os.remove(absfile)
+    return True
 
 class EQSANSIQOutput(stresstesting.MantidStressTest):
+
+    def cleanup(self):
+        do_cleanup()
+        return True
     """
         Analysis Tests for EQSANS
         Testing that the I(Q) output of is correct 
@@ -43,6 +59,10 @@ def validate(self):
         return "EQSANS_1466_event_Iq", 'EQSANSIQOutput.nxs'
 
 class EQSANSBeamMonitor(stresstesting.MantidStressTest):
+
+    def cleanup(self):
+        do_cleanup()
+        return True
     """
         Analysis Tests for EQSANS
         Testing that the I(Q) output of is correct 
@@ -69,6 +89,10 @@ def validate(self):
         return "EQSANS_1466_event_Iq", 'EQSANSBeamMonitor.nxs'
 
 class EQSANSDQPositiveOutput(stresstesting.MantidStressTest):
+
+    def cleanup(self):
+        do_cleanup()
+        return True
     """
         Analysis Tests for EQSANS
         Testing that the Q resolution output of is correct 
@@ -102,6 +126,10 @@ def validate(self):
         return True
 
 class EQSANSDQOutput(stresstesting.MantidStressTest):
+
+    def cleanup(self):
+        do_cleanup()
+        return True
     """
         Analysis Tests for EQSANS
         Testing that the Q resolution output of is correct 
@@ -164,6 +192,10 @@ def validate(self):
         return output
 
 class EQSANSDQOutput_FS(stresstesting.MantidStressTest):
+
+    def cleanup(self):
+        do_cleanup()
+        return True
     """
         Analysis Tests for EQSANS
         Testing that the Q resolution output of is correct 

SystemTests/AnalysisTests/EQSANSProcessedEffAPIv2.py

@@ -2,8 +2,18 @@
 import mantid
 from mantid.simpleapi import *
 from reduction_workflow.instruments.sans.sns_command_interface import *
+from mantid.api import FileFinder
+
+import os
 
 class EQSANSProcessedEff(stresstesting.MantidStressTest):
+
+    def cleanup(self):
+        absfile = FileFinder.getFullPath("EQSANS_1466_event_reduction.log")
+        if os.path.exists(absfile):
+            os.remove(absfile)
+        return True
+
     def runTest(self):
         """
             System test for sensitivity correction

SystemTests/AnalysisTests/EQSANSSolidAPIv2.py

@@ -3,7 +3,20 @@
 from reduction_workflow.instruments.sans.sns_command_interface import *
 from mantid.api import *
 
+import os
+
+def do_cleanup():
+    absfile = FileFinder.getFullPath("EQSANS_1466_event_reduction.log")
+    if os.path.exists(absfile):
+        os.remove(absfile)
+        print "cleaned"
+    return True
+
 class EQSANSSolid(stresstesting.MantidStressTest):
+
+    def cleanup(self):
+        do_cleanup()
+        return True
     """
         Analysis Tests for EQSANS
         Testing that the I(Q) output of is correct 
@@ -43,6 +56,10 @@ def validate(self):
         return "EQSANS_1466_event_Iq", 'EQSANSSolid.nxs'
 
 class EQSANSSolidEvent(EQSANSSolid):
+
+    def cleanup(self):
+        do_cleanup()
+        return True
     """
         Analysis Tests for EQSANS
         Testing that the I(Q) output of is correct 

SystemTests/AnalysisTests/EQSANSTransAPIv2.py

@@ -4,7 +4,23 @@
 from reduction_workflow.instruments.sans.sns_command_interface import *
 from mantid.api import *
 
+import os
+
+def do_cleanup():
+    Files = ["EQSANS_4061_event_reduction.log",
+    "EQSANS_1466_event_reduction.log"]
+    for file in Files:
+        absfile = FileFinder.getFullPath(file)
+        if os.path.exists(absfile):
+            os.remove(absfile)
+    return True
+
 class EQSANSTransmission(stresstesting.MantidStressTest):
+
+    def cleanup(self):
+        do_cleanup()
+        return True
+
     def runTest(self):
         config = ConfigService.Instance()
         config["facilityName"]='SNS'
@@ -34,7 +50,12 @@ def validate(self):
         self.disableChecking.append('Axes')
         return "EQSANS_1466_event_Iq", 'EQSANSTrans.nxs'
 
-class EQSANSTransmissionEvent(EQSANSTransmission):    
+class EQSANSTransmissionEvent(EQSANSTransmission):
+
+    def cleanup(self):
+        do_cleanup()
+        return True
+
     def runTest(self):
         config = ConfigService.Instance()
         config["facilityName"]='SNS'
@@ -65,6 +86,11 @@ def validate(self):
 
 
 class EQSANSTransmissionDC(stresstesting.MantidStressTest):
+
+    def cleanup(self):
+        do_cleanup()
+        return True
+
     def runTest(self):
         """
             Check that EQSANSTofStructure returns the correct workspace
@@ -98,6 +124,11 @@ def validate(self):
         return "EQSANS_1466_event_Iq", 'EQSANSTransmissionDC.nxs'
 
 class EQSANSTransmissionCompatibility(EQSANSTransmission):
+
+    def cleanup(self):
+        do_cleanup()
+        return True
+
     """
         Analysis Tests for EQSANS
         Check that the transmission correction can be applied if the 
@@ -133,7 +164,11 @@ def validate(self):
         return "EQSANS_1466_event_Iq", 'EQSANSTransmissionCompatibility.nxs'
 
 class EQSANSTransmissionFS(stresstesting.MantidStressTest):
-
+
+    def cleanup(self):
+        do_cleanup()
+        return True
+
     def runTest(self):
         """
             Check that EQSANSTofStructure returns the correct workspace
@@ -161,7 +196,11 @@ def validate(self):
         return "EQSANS_4061_event_frame1_Iq", 'EQSANSTransmissionFS.nxs' 
 
 class EQSANSDirectTransFS(stresstesting.MantidStressTest):
-
+
+    def cleanup(self):
+        do_cleanup()
+        return True
+
     def runTest(self):
         """
             Check that EQSANSTofStructure returns the correct workspace