Changeset 464cd07 in sasview for src/sas/qtgui/Perspectives

Timestamp:

Aug 22, 2017 5:59:29 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:

b2a5042

Parents:

457d961

Message:

Use singleton QApplication in unit tests to avoid issues on Ubuntu. SASVIEW-485

Location:

src/sas/qtgui/Perspectives/Fitting/UnitTesting

Files:

• FittingLogicTest.py (modified) (1 diff, 1 prop)
• FittingOptionsTest.py (modified) (1 diff)
• FittingPerspectiveTest.py (modified) (1 diff)
• FittingWidgetTest.py (modified) (1 diff)

src/sas/qtgui/Perspectives/Fitting/UnitTesting/FittingLogicTest.py

@@ -13 +13 @@
 from sas.qtgui.Plotting.PlotterData import Data1D
 
-app = QtGui.QApplication(sys.argv)
+if not QtGui.QApplication.instance():
+    app = QtGui.QApplication(sys.argv)
 
 

src/sas/qtgui/Perspectives/Fitting/UnitTesting/FittingOptionsTest.py

@@ -16 +16 @@
 from sas.qtgui.Perspectives.Fitting.FittingOptions import FittingOptions
 
-app = QtGui.QApplication(sys.argv)
+if not QtGui.QApplication.instance():
+    app = QtGui.QApplication(sys.argv)
 
 class FittingOptionsTest(unittest.TestCase):

src/sas/qtgui/Perspectives/Fitting/UnitTesting/FittingPerspectiveTest.py

@@ -16 +16 @@
 from sas.qtgui.Perspectives.Fitting.FittingPerspective import FittingWindow
 
-app = QtGui.QApplication(sys.argv)
+if not QtGui.QApplication.instance():
+    app = QtGui.QApplication(sys.argv)
 
 class FittingPerspectiveTest(unittest.TestCase):

src/sas/qtgui/Perspectives/Fitting/UnitTesting/FittingWidgetTest.py

@@ -20 +20 @@
 from sas.qtgui.Plotting.PlotterData import Data2D
 
-app = QtGui.QApplication(sys.argv)
+if not QtGui.QApplication.instance():
+    app = QtGui.QApplication(sys.argv)
 
 class dummy_manager(object):