Author: bugman Date: Wed May 28 17:31:46 2014 New Revision: 23535 URL: http://svn.gna.org/viewcvs/relax?rev=23535&view=rev Log: Merged revisions 23505 via svnmerge from svn+ssh://bugman@xxxxxxxxxxx/svn/relax/trunk ........ r23505 | bugman | 2014-05-28 11:58:29 +0200 (Wed, 28 May 2014) | 6 lines Some more fixes for the User_functions.test_structure_rotate GUI test. The open_dialog() method cannot be used, as it deletes the window at the end. Instead the selection_win_show() and selection_win_data() method combination is used. ........ Modified: branches/frame_order_cleanup/ (props changed) branches/frame_order_cleanup/test_suite/gui_tests/test_user_functions.py Propchange: branches/frame_order_cleanup/ ------------------------------------------------------------------------------ --- svnmerge-integrated (original) +++ svnmerge-integrated Wed May 28 17:31:46 2014 @@ -1 +1 @@ -/trunk:1-23493,23495-23500 +/trunk:1-23493,23495-23500,23505 Modified: branches/frame_order_cleanup/test_suite/gui_tests/test_user_functions.py URL: http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/test_suite/gui_tests/test_user_functions.py?rev=23535&r1=23534&r2=23535&view=diff ============================================================================== --- branches/frame_order_cleanup/test_suite/gui_tests/test_user_functions.py (original) +++ branches/frame_order_cleanup/test_suite/gui_tests/test_user_functions.py Wed May 28 17:31:46 2014 @@ -135,8 +135,9 @@ uf.create_wizard(parent=self.app.gui) # Change the rotation matrix without changing anything. - uf.page.uf_args['R'].open_dialog(None) + uf.page.uf_args['R'].selection_win_show() uf.page.uf_args['R'].sel_win.sequence.SetStringItem(index=1, col=1, label=int_to_gui(2)) + uf.page.uf_args['R'].selection_win_data() # GUI data checks for the rotation matrix. R = uf.page.uf_args['R'].GetValue()