Refs #4316 : re-enabled python interface test to try them

Hopefully the loop will not get stuck on Mac
mantidproject · Dec 19, 2011 · 1c56ad5 · 1c56ad5
1 parent 8917647
commit 1c56ad5
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 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
@@ -49,10 +49,19 @@ def setUp(self):
     def tearDown(self):
         """ Close the created widget """
         # This is crucial! Forces the object to be deleted NOW, not when python exits
+        # This prevents a segfault in Ubuntu 10.04, and is good practice.
         self.svw.deleteLater()
         self.svw.show()
-        # This is required for deleteLater() to do anything (it deletes at the next event loop
+        # Schedule quit at the next event
+        Qt.QTimer.singleShot(0, app, Qt.SLOT("closeAllWindows()"))
+        # 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
 
     #==========================================================================
     #======================= Basic Tests ======================================