From 9bb926f8df05701ac355862cc28b5dd0cc021a63 Mon Sep 17 00:00:00 2001 From: Russell Taylor Date: Mon, 19 May 2014 17:21:24 -0400 Subject: [PATCH 1/3] Re #7521. Speed up test 3x by using a smaller IDF. --- Code/Mantid/Framework/Crystal/test/LoadIsawSpectrumTest.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Code/Mantid/Framework/Crystal/test/LoadIsawSpectrumTest.h b/Code/Mantid/Framework/Crystal/test/LoadIsawSpectrumTest.h index da61313475c5..a66d942915db 100644 --- 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(); ); From a20a2b069111ed91bf09fb62113586f50dae78e9 Mon Sep 17 00:00:00 2001 From: Russell Taylor Date: Mon, 19 May 2014 17:25:54 -0400 Subject: [PATCH 2/3] Re #7521. Remove check that accounts for 60% of test time. I think we can manage without this as using MERLIN is tested in a system test. --- Code/Mantid/scripts/test/DirectEnergyConversionTest.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/Code/Mantid/scripts/test/DirectEnergyConversionTest.py b/Code/Mantid/scripts/test/DirectEnergyConversionTest.py index 90a68bff2992..cb1f0c830c35 100644 --- a/Code/Mantid/scripts/test/DirectEnergyConversionTest.py +++ b/Code/Mantid/scripts/test/DirectEnergyConversionTest.py @@ -66,10 +66,6 @@ def test_init_reducer(self): 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 +377,4 @@ def test_load_monitors_with_workspacer(self): if __name__=="__main__": - unittest.main() \ No newline at end of file + unittest.main() From 9d0116c35a77ae2e495b04b41104bf7335f3c071 Mon Sep 17 00:00:00 2001 From: Russell Taylor Date: Mon, 19 May 2014 17:27:18 -0400 Subject: [PATCH 3/3] Re #7521. Speed up test. This code isn't used at the SNS anyway (we use DGSReduction). --- Code/Mantid/scripts/test/DirectEnergyConversionTest.py | 7 ------- 1 file changed, 7 deletions(-) diff --git a/Code/Mantid/scripts/test/DirectEnergyConversionTest.py b/Code/Mantid/scripts/test/DirectEnergyConversionTest.py index cb1f0c830c35..1cba3c269816 100644 --- a/Code/Mantid/scripts/test/DirectEnergyConversionTest.py +++ b/Code/Mantid/scripts/test/DirectEnergyConversionTest.py @@ -59,13 +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') - self.assertRaises(KeyError,setattr,tReducer,'instr_name','NonExistingInstrument')