r18171 - in /branches/frame_order_testing: ./ gui/errors.py test_suite/gui_tests/bruker.py -- December 19, 2012 - 17:36

Author: bugman
Date: Wed Dec 19 17:36:10 2012
New Revision: 18171

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

........
  r18169 | bugman | 2012-12-19 17:33:44 +0100 (Wed, 19 Dec 2012) | 7 lines
  
  Partial fix for bug #20378 (https://gna.org/bugs/index.php?20378).
  
  The gui_raise() function was operating differently under the command line 
run test suite and the GUI
  run test suite.  The operation of the function is now consistent, and no 
RelaxError is raised
  (unless the raise_flag argument is set).
........
  r18170 | bugman | 2012-12-19 17:35:49 +0100 (Wed, 19 Dec 2012) | 7 lines
  
  Full fix for bug #20378 (https://gna.org/bugs/index.php?20378).
  
  As no RelaxError is no longer raised in this 
Bruker.test_bug_20152_read_dc_file GUI test (well only
  in the command line operation of the GUI tests), instead the current data 
pipe is checked to make
  sure no relaxation data was loaded.
........

Modified:
    branches/frame_order_testing/   (props changed)
    branches/frame_order_testing/gui/errors.py
    branches/frame_order_testing/test_suite/gui_tests/bruker.py

Propchange: branches/frame_order_testing/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Wed Dec 19 17:36:10 2012
@@ -1,1 +1,1 @@
-/trunk:1-18167
+/trunk:1-18170

Modified: branches/frame_order_testing/gui/errors.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/gui/errors.py?rev=18171&r1=18170&r2=18171&view=diff
==============================================================================
--- branches/frame_order_testing/gui/errors.py (original)
+++ branches/frame_order_testing/gui/errors.py Wed Dec 19 17:36:10 2012
@@ -40,10 +40,6 @@
     @raises RelaxError:     This raises all RelaxErrors, if the raise flag 
is given.
     """
 
-    # Die if running in test mode.
-    if status.test_mode:
-        raise relax_error
-
     # Turn off the busy cursor if needed.
     if wx.IsBusy():
         wx.EndBusyCursor()

Modified: branches/frame_order_testing/test_suite/gui_tests/bruker.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/test_suite/gui_tests/bruker.py?rev=18171&r1=18170&r2=18171&view=diff
==============================================================================
--- branches/frame_order_testing/test_suite/gui_tests/bruker.py (original)
+++ branches/frame_order_testing/test_suite/gui_tests/bruker.py Wed Dec 19 
17:36:10 2012
@@ -119,12 +119,13 @@
         page.uf_args['ri_id'].SetValue(str_to_gui('r1_700'))
         page.uf_args['file'].SetValue(str_to_gui(status.install_path + sep + 
'test_suite' + sep + 'shared_data' + sep + 'bruker_files' + sep + 
'T1_demo_1UBQ_H_trunc.txt'))
 
-        # Catch the failure.
-        try:
-            error = False
-            analysis.relax_data.wizard._go_next(None)
-        except RelaxError:
-            error = True
+        # Cause the failure.
+        analysis.relax_data.wizard._go_next(None)
 
-        # Assert that the RelaxError has occurred.
-        self.assertEqual(error, True)
+        # Check that no data was loaded.
+        self.assert_(not hasattr(cdp, 'ri_ids'))
+        self.assert_(not hasattr(cdp, 'frq'))
+        self.assert_(not hasattr(cdp, 'ri_type'))
+        for spin in spin_loop():
+            self.assert_(not hasattr(spin, 'ri_data'))
+            self.assert_(not hasattr(spin, 'ri_data_err'))