Refs #4316 GUI test that seems to work on RHEL5 and Ubuntu 10.04

mantidproject · Dec 19, 2011 · 54d48dc · 54d48dc
1 parent 72c2061
commit 54d48dc
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 9 deletions.
diff --git a/Code/Mantid/MantidQt/SliceViewer/CMakeLists.txt b/Code/Mantid/MantidQt/SliceViewer/CMakeLists.txt
@@ -129,8 +129,8 @@ endif ()
 ###########################################################################
 
 # python unit tests
-#if ( PYUNITTEST_FOUND )
-if ( 0 )
+if ( PYUNITTEST_FOUND )
+#if ( 0 )
   pyunittest_add_test ( SliceViewerTest.py ${TEST_PY_FILES} "" )
   add_dependencies ( SliceViewerTest.py MantidQt Algorithms )
   add_dependencies ( GUITests SliceViewerTest.py )

diff --git a/Code/Mantid/MantidQt/SliceViewer/test/SliceViewerPythonInterfaceTest.py b/Code/Mantid/MantidQt/SliceViewer/test/SliceViewerPythonInterfaceTest.py
@@ -53,15 +53,11 @@ def tearDown(self):
         self.svw.deleteLater()
         self.svw.show()
         # Schedule quit at the next event
-        Qt.QTimer.singleShot(0, app, Qt.SLOT("closeAllWindows()"))
+        Qt.QTimer.singleShot(0, app, Qt.SLOT("quit()"))
         # This is required for deleteLater() to do anything (it deletes at the next event loop)
         app.quitOnLastWindowClosed = True
-        app.exec_()
-        return
-
-        while app.hasPendingEvents():
-        	app.processEvents()
-        pass
+       	app.exec_()
+
 
     #==========================================================================
     #======================= Basic Tests ======================================