Fix tests for older Python

Refs #11097
mantidproject · Mar 17, 2015 · fbb4522 · fbb4522
1 parent 13ec965
commit fbb4522
Showing 1 changed file with 24 additions and 16 deletions.
diff --git a/Code/Mantid/Framework/PythonInterface/test/python/plugins/algorithms/MSDFitTest.py b/Code/Mantid/Framework/PythonInterface/test/python/plugins/algorithms/MSDFitTest.py
@@ -84,43 +84,51 @@ def test_fail_spec_min(self):
         Tests validation for SpecMin >= num histograms.
         """
 
-        with self.assertRaises(RuntimeError):
-            msd, param, fit = MSDFit(InputWorkspace=self._ws,
-                                     XStart=0.0, XEnd=5.0,
-                                     SpecMin=0, SpecMax=20)
+        self.assertRaises(RuntimeError,
+                          MSDFit,
+                          InputWorkspace=self._ws,
+                          XStart=0.0, XEnd=5.0,
+                          SpecMin=0, SpecMax=20,
+                          OutputWorkspace='msd')
 
 
     def test_fail_spec_range(self):
         """
         Test svalidation for SpecMax >= SpecMin.
         """
 
-        with self.assertRaises(RuntimeError):
-            msd, param, fit = MSDFit(InputWorkspace=self._ws,
-                                     XStart=0.0, XEnd=5.0,
-                                     SpecMin=1, SpecMax=0)
+        self.assertRaises(RuntimeError,
+                          MSDFit,
+                          InputWorkspace=self._ws,
+                          XStart=0.0, XEnd=5.0,
+                          SpecMin=1, SpecMax=0,
+                          OutputWorkspace='msd')
 
 
     def test_fail_x_range(self):
         """
         Tests validation for XStart < XEnd.
         """
 
-        with self.assertRaises(RuntimeError):
-            msd, param, fit = MSDFit(InputWorkspace=self._ws,
-                                     XStart=10.0, XEnd=5.0,
-                                     SpecMin=0, SpecMax=0)
+        self.assertRaises(RuntimeError,
+                          MSDFit,
+                          InputWorkspace=self._ws,
+                          XStart=10.0, XEnd=5.0,
+                          SpecMin=0, SpecMax=0,
+                          OutputWorkspace='msd')
 
 
     def test_fail_x_range_ws(self):
         """
         Tests validation for X range in workspace range
         """
 
-        with self.assertRaises(RuntimeError):
-            msd, param, fit = MSDFit(InputWorkspace=self._ws,
-                                     XStart=0.0, XEnd=20.0,
-                                     SpecMin=0, SpecMax=0)
+        self.assertRaises(RuntimeError,
+                          MSDFit,
+                          InputWorkspace=self._ws,
+                          XStart=0.0, XEnd=20.0,
+                          SpecMin=0, SpecMax=0,
+                          OutputWorkspace='msd')
 
 
 if __name__ == '__main__':