Author: bugman
Date: Sun Apr 21 12:09:10 2013
New Revision: 19526
URL: http://svn.gna.org/viewcvs/relax?rev=19526&view=rev
Log:
Merged revisions 19525 via svnmerge from
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/trunk
........
r19525 | bugman | 2013-04-21 12:06:47 +0200 (Sun, 21 Apr 2013) | 5 lines
Fixes for the GUI tests for the new analysis wizard get_data() method
returning more variables.
The method now also returns the list of user function on_execute() methods.
........
Modified:
branches/relax_disp/ (props changed)
branches/relax_disp/test_suite/gui_tests/bruker.py
branches/relax_disp/test_suite/gui_tests/model_free.py
branches/relax_disp/test_suite/gui_tests/noe.py
branches/relax_disp/test_suite/gui_tests/rx.py
Propchange: branches/relax_disp/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Sun Apr 21 12:09:10 2013
@@ -1,1 +1,1 @@
-/trunk:1-19523
+/trunk:1-19525
Modified: branches/relax_disp/test_suite/gui_tests/bruker.py
URL:
http://svn.gna.org/viewcvs/relax/branches/relax_disp/test_suite/gui_tests/bruker.py?rev=19526&r1=19525&r2=19526&view=diff
==============================================================================
--- branches/relax_disp/test_suite/gui_tests/bruker.py (original)
+++ branches/relax_disp/test_suite/gui_tests/bruker.py Sun Apr 21 12:09:10
2013
@@ -72,7 +72,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)
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=19526&r1=19525&r2=19526&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:09:10 2013
@@ -60,7 +60,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)
Modified: branches/relax_disp/test_suite/gui_tests/noe.py
URL:
http://svn.gna.org/viewcvs/relax/branches/relax_disp/test_suite/gui_tests/noe.py?rev=19526&r1=19525&r2=19526&view=diff
==============================================================================
--- branches/relax_disp/test_suite/gui_tests/noe.py (original)
+++ branches/relax_disp/test_suite/gui_tests/noe.py Sun Apr 21 12:09:10 2013
@@ -56,7 +56,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)
Modified: branches/relax_disp/test_suite/gui_tests/rx.py
URL:
http://svn.gna.org/viewcvs/relax/branches/relax_disp/test_suite/gui_tests/rx.py?rev=19526&r1=19525&r2=19526&view=diff
==============================================================================
--- branches/relax_disp/test_suite/gui_tests/rx.py (original)
+++ branches/relax_disp/test_suite/gui_tests/rx.py Sun Apr 21 12:09:10 2013
@@ -112,7 +112,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)
r19526 - in /branches/relax_disp: ./ test_suite/gui_tests/