Author: bugman Date: Tue Oct 21 18:07:53 2014 New Revision: 26330 URL: http://svn.gna.org/viewcvs/relax?rev=26330&view=rev Log: Merged revisions 26305-26306 via svnmerge from svn+ssh://bugman@xxxxxxxxxxx/svn/relax/trunk ........ r26305 | bugman | 2014-10-17 14:58:52 +0200 (Fri, 17 Oct 2014) | 14 lines Changed the logic for how the new analysis wizard in the GUI is destroyed. This relates to bug #22818 (https://gna.org/bugs/?22818), the GUI test suite failures in MS Windows - PyAssertionError: C++ assertion "Assert failure". The Destroy() method has been added to the Analysis_wizard class to properly close all elements of the wizard. This is now called from the menu_new() method of the Analysis_controller class, which is the target of the menu item and toolbar button. To allow the test suite to use this, the menu_new() method now accepts the destroy boolean argument. The test suite can set this to False and then access the GUI elements after calling the method (however the Destroy() method must be called by the test suite). ........ r26306 | bugman | 2014-10-17 15:05:32 +0200 (Fri, 17 Oct 2014) | 16 lines Resign of how the new analysis wizard is handled in the GUI tests. This relates to bug #22818 (https://gna.org/bugs/?22818), the GUI test suite failures in MS Windows - PyAssertionError: C++ assertion "Assert failure". The GUI test base class method new_analysis_wizard() has been created to simplify the process. When a new analysis is desired, this method should be called. It will return the analysis page GUI element for use in the test. The method standardises the execution of the new analysis wizard and sets up the analysis in the GUI. It also properly destroys the wizard to avoid the memory leaking issues such as bug #22818. All GUI tests have been converted to use new_analysis_wizard(). This allows the GUI tests to pass on MS Windows. However there are still significant sources of memory leaks (the USER Objects count) visible in the Windows Task Manager. ........ Modified: branches/frame_order_cleanup/ (props changed) branches/frame_order_cleanup/gui/analyses/__init__.py branches/frame_order_cleanup/gui/analyses/wizard.py branches/frame_order_cleanup/test_suite/gui_tests/base_classes.py branches/frame_order_cleanup/test_suite/gui_tests/bruker.py branches/frame_order_cleanup/test_suite/gui_tests/general.py branches/frame_order_cleanup/test_suite/gui_tests/model_free.py branches/frame_order_cleanup/test_suite/gui_tests/noe.py branches/frame_order_cleanup/test_suite/gui_tests/relax_disp.py branches/frame_order_cleanup/test_suite/gui_tests/rx.py [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/frame_order_cleanup/gui/analyses/__init__.py URL: http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/gui/analyses/__init__.py?rev=26330&r1=26329&r2=26330&view=diff Modified: branches/frame_order_cleanup/gui/analyses/wizard.py URL: http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/gui/analyses/wizard.py?rev=26330&r1=26329&r2=26330&view=diff Modified: branches/frame_order_cleanup/test_suite/gui_tests/base_classes.py URL: http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/test_suite/gui_tests/base_classes.py?rev=26330&r1=26329&r2=26330&view=diff Modified: branches/frame_order_cleanup/test_suite/gui_tests/bruker.py URL: http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/test_suite/gui_tests/bruker.py?rev=26330&r1=26329&r2=26330&view=diff Modified: branches/frame_order_cleanup/test_suite/gui_tests/general.py URL: http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/test_suite/gui_tests/general.py?rev=26330&r1=26329&r2=26330&view=diff Modified: branches/frame_order_cleanup/test_suite/gui_tests/model_free.py URL: http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/test_suite/gui_tests/model_free.py?rev=26330&r1=26329&r2=26330&view=diff Modified: branches/frame_order_cleanup/test_suite/gui_tests/noe.py URL: http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/test_suite/gui_tests/noe.py?rev=26330&r1=26329&r2=26330&view=diff Modified: branches/frame_order_cleanup/test_suite/gui_tests/relax_disp.py URL: http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/test_suite/gui_tests/relax_disp.py?rev=26330&r1=26329&r2=26330&view=diff Modified: branches/frame_order_cleanup/test_suite/gui_tests/rx.py URL: http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/test_suite/gui_tests/rx.py?rev=26330&r1=26329&r2=26330&view=diff