r19529 - in /branches/relax_disp: ./ test_suite/gui_tests/model_free.py -- April 21, 2013 - 12:49

Author: bugman
Date: Sun Apr 21 12:49:30 2013
New Revision: 19529

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

........
  r19527 | bugman | 2013-04-21 12:47:00 +0200 (Sun, 21 Apr 2013) | 3 lines
  
  More fixes for the GUI tests for the new analysis wizard get_data() method 
returning more variables.
........

Modified:
    branches/relax_disp/   (props changed)
    branches/relax_disp/test_suite/gui_tests/model_free.py

Propchange: branches/relax_disp/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Sun Apr 21 12:49:30 2013
@@ -1,1 +1,1 @@
-/trunk:1-19525
+/trunk:1-19528

Modified: branches/relax_disp/test_suite/gui_tests/model_free.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/relax_disp/test_suite/gui_tests/model_free.py?rev=19529&r1=19528&r2=19529&view=diff
==============================================================================
--- branches/relax_disp/test_suite/gui_tests/model_free.py (original)
+++ branches/relax_disp/test_suite/gui_tests/model_free.py Sun Apr 21 
12:49:30 2013
@@ -207,7 +207,7 @@
         self.app.gui.analysis.new_wizard.wizard._go_next(None)
 
         # Get the data.
-        analysis_type, analysis_name, pipe_name, pipe_bundle = 
self.app.gui.analysis.new_wizard.get_data()
+        analysis_type, analysis_name, pipe_name, pipe_bundle, uf_exec = 
self.app.gui.analysis.new_wizard.get_data()
 
         # Set up the analysis.
         self.app.gui.analysis.new_analysis(analysis_type=analysis_type, 
analysis_name=analysis_name, pipe_name=pipe_name, pipe_bundle=pipe_bundle)