r23575 - in /branches/frame_order_cleanup: ./ test_suite/gui_tests/test_user_functions.py -- May 28, 2014 - 20:33

Author: bugman
Date: Wed May 28 20:33:25 2014
New Revision: 23575

URL: http://svn.gna.org/viewcvs/relax?rev=23575&view=rev
Log:
Merged revisions 23572 via svnmerge from 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/trunk

........
  r23572 | bugman | 2014-05-28 20:31:19 +0200 (Wed, 28 May 2014) | 5 lines
  
  Fix for the User_functions.test_spectrum_read_intensities GUI test.
  
  A valid value was being checked as invalid.
........

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 20:33:25 2014
@@ -1 +1 @@
-/trunk:1-23571
+/trunk:1-23573

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=23575&r1=23574&r2=23575&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 20:33:25 2014
@@ -182,7 +182,7 @@
         self.assertEqual(file[1], 'test2')
 
         # Set the file to a number of invalid values, checking that they are 
ignored.
-        for val in ["['1', '2', '3'", "['1'", "[['1'], ['2'], ['1', '2', 
'3']]"]:
+        for val in ["['1', '2', '3'", "['1'"]:
             uf.page.uf_args['file'].SetValue(str_to_gui(val))
             uf.page.uf_args['file'].selection_win_show()
             uf.page.uf_args['file'].selection_win_data()