Changeset f4a1433 in sasview for src/sas/qtgui/GUITests.py


Ignore:
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:
1 edited

Legend:

Unmodified
Added
Removed

  • src/sas/qtgui/GUITests.py

    rd5c5d3d rf4a1433  
    7676 
    7777        # Main window 
     78        unittest.makeSuite(DataExplorerTest.DataExplorerTest,  'test'), 
     79        unittest.makeSuite(GuiManagerTest.GuiManagerTest,      'test'), 
     80        unittest.makeSuite(GuiUtilsTest.GuiUtilsTest,          'test'), 
    7881        unittest.makeSuite(AboutBoxTest.AboutBoxTest,          'test'), 
    79         unittest.makeSuite(DataExplorerTest.DataExplorerTest,  'test'), 
    8082        unittest.makeSuite(WelcomePanelTest.WelcomePanelTest,  'test'), 
    8183        unittest.makeSuite(DroppableDataLoadWidgetTest.DroppableDataLoadWidgetTest, 'test'), 
    82         unittest.makeSuite(GuiManagerTest.GuiManagerTest,      'test'), 
    83         unittest.makeSuite(GuiUtilsTest.GuiUtilsTest,          'test'), 
    8484        unittest.makeSuite(MainWindowTest.MainWindowTest,      'test'), 
    8585 
Note: See TracChangeset for help on using the changeset viewer.