Merge remote-tracking branch 'origin/bugfix/7521_slow_unit_tests'

mantidproject · May 23, 2014 · ef4ec7a · ef4ec7a
2 parents 00e1e93 + 9d0116c
commit ef4ec7a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 13 deletions.
diff --git a/Code/Mantid/Framework/Crystal/test/LoadIsawSpectrumTest.h b/Code/Mantid/Framework/Crystal/test/LoadIsawSpectrumTest.h
@@ -37,7 +37,7 @@ class LoadIsawSpectrumTest : public CxxTest::TestSuite
     LoadIsawSpectrum alg;
     TS_ASSERT_THROWS_NOTHING( alg.initialize() )
     TS_ASSERT( alg.isInitialized() )
-    TS_ASSERT_THROWS_NOTHING( alg.setPropertyValue("InstrumentFilename", "TOPAZ_Definition_2012-08-23.xml") );
+    TS_ASSERT_THROWS_NOTHING( alg.setPropertyValue("InstrumentFilename", "TOPAZ_Definition_2010.xml") );
     TS_ASSERT_THROWS_NOTHING( alg.setPropertyValue("SpectraFile", "Spectrum_ISAW.dat") );
     TS_ASSERT_THROWS_NOTHING( alg.setPropertyValue("OutputWorkspace", "LoadIsawSpectrumTest_ws") );
     TS_ASSERT_THROWS_NOTHING( alg.execute(); );

diff --git a/Code/Mantid/scripts/test/DirectEnergyConversionTest.py b/Code/Mantid/scripts/test/DirectEnergyConversionTest.py
@@ -59,17 +59,6 @@ def test_init_reducer(self):
         tReducer.initialise("MAP",True);
         self.assertEqual(tReducer.instr_name,"MAP")
 
-        #config.setFacility("SNS")
-        #config.setString('default.facility','SNS')
-        tReducer.instr_name = 'SEQ'
-        self.assertTrue(tReducer._idf_values_read)
-        self.assertEqual(tReducer.instr_name,"SEQ")
-        self.assertEqual(tReducer.facility,'SNS')
-
-        tReducer.instr_name = 'MER'
-        self.assertEqual(tReducer.instr_name,"MER")
-        self.assertEqual(tReducer.facility,'ISIS')
-
         self.assertRaises(KeyError,setattr,tReducer,'instr_name','NonExistingInstrument')
 
 
@@ -381,4 +370,4 @@ def test_load_monitors_with_workspacer(self):
 
 
 if __name__=="__main__":
-        unittest.main()
+        unittest.main()