r18424 - in /branches/frame_order_testing: ./ test_suite/gui_tests/model_free.py -- February 05, 2013 - 10:31

Author: bugman
Date: Tue Feb  5 10:31:27 2013
New Revision: 18424

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

........
  r18423 | bugman | 2013-02-05 10:14:37 +0100 (Tue, 05 Feb 2013) | 6 lines
  
  Proper handling of the dipole interaction wizard in the 
Mf.test_bug_20479_gui_final_pipe GUI test.
  
  This was causing the subsequent GUI tests to fail as the observer objects 
from the wizard were not
  all being unregistered.
........

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

Propchange: branches/frame_order_testing/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Feb  5 10:31:27 2013
@@ -1,1 +1,1 @@
-/trunk:1-18421
+/trunk:1-18423

Modified: branches/frame_order_testing/test_suite/gui_tests/model_free.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/test_suite/gui_tests/model_free.py?rev=18424&r1=18423&r2=18424&view=diff
==============================================================================
--- branches/frame_order_testing/test_suite/gui_tests/model_free.py (original)
+++ branches/frame_order_testing/test_suite/gui_tests/model_free.py Tue Feb  
5 10:31:27 2013
@@ -115,18 +115,15 @@
         # Attach the protons.
         self._execute_uf(uf_name='sequence.attach_protons')
 
-        # Dipole-dipole interaction wizard:  Initialisation and skipping of 
the structure loading.
-        analysis.setup_dipole_pair()
-        analysis.dipole_wizard._current_page = 2
-
-        # Dipole-dipole interaction wizard:  The dipole_pair.define and 
dipole_pair.set_dist user functions (but skipping dipole_pair.unit_vectors).
-        analysis.dipole_wizard._apply()
-        interpreter.flush()    # Required because of the asynchronous uf 
call.
-        page = analysis.dipole_wizard.get_page(0)
-        analysis.dipole_wizard._go_next()
-        interpreter.flush()    # Required because of the asynchronous uf 
call.
-        analysis.dipole_wizard._go_next()
-        interpreter.flush()    # Required because of the asynchronous uf 
call.
+        # Dipole-dipole interaction wizard.
+        analysis.setup_dipole_pair()        # Initialisation.
+        analysis.dipole_wizard._skip()      # Skip the structure.read_pdb 
user function.
+        analysis.dipole_wizard._skip()      # Skip the structure.get_pos 
user function.
+        analysis.dipole_wizard._go_next()   # The dipole_pair.define user 
function.
+        interpreter.flush()                 # Required because of the 
asynchronous uf call.
+        analysis.dipole_wizard._go_next()   # The dipole_pair.set_dist user 
function.
+        interpreter.flush()                 # Required because of the 
asynchronous uf call.
+        analysis.dipole_wizard._skip()      # Skip the 
dipole_pair.unit_vectors user function.
 
         # Set up the CSA interaction.
         analysis.value_set_csa()