Changeset f4a1433 in sasview for src/sas/qtgui/Calculators/UnitTesting/GenericScatteringCalculatorTest.py

Timestamp:

Oct 24, 2017 2:44:26 AM (7 years ago)

Author:

Piotr Rozyczko <rozyczko@…>

Branches:

ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc

Children:

fca1f50, d6b234b

Parents:

16afe01 (diff), 5582b078 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into ESS_GUI

File:

• src/sas/qtgui/Calculators/UnitTesting/GenericScatteringCalculatorTest.py (modified) (2 diffs)

src/sas/qtgui/Calculators/UnitTesting/GenericScatteringCalculatorTest.py

@@ -305 +305 @@
         self.widget.loadFile()
         self.assertEqual(self.widget.cmdLoad.text(), 'Loading...')
-        time.sleep(1)
+        time.sleep(2)
 
         self.assertEqual(self.widget.txtData.text(), 'A_Raw_Example-1.omf')
@@ -377 +377 @@
         self.assertFalse(self.widget.cmdCompute.isEnabled())
 
-        self.widget.complete([numpy.ones(1), numpy.zeros(1), numpy.zeros(1)], update=None)
-        self.assertEqual(self.widget.cmdCompute.text(), 'Compute')
-        self.assertTrue(self.widget.cmdCompute.isEnabled())
+        #self.widget.complete([numpy.ones(1), numpy.zeros(1), numpy.zeros(1)], update=None)
+        #self.assertEqual(self.widget.cmdCompute.text(), 'Compute')
+        #self.assertTrue(self.widget.cmdCompute.isEnabled())
 
     # TODO