r18170 - /trunk/test_suite/gui_tests/bruker.py -- December 19, 2012 - 17:35

Author: bugman
Date: Wed Dec 19 17:35:49 2012
New Revision: 18170

URL: http://svn.gna.org/viewcvs/relax?rev=18170&view=rev
Log:
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:
    trunk/test_suite/gui_tests/bruker.py

Modified: trunk/test_suite/gui_tests/bruker.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/gui_tests/bruker.py?rev=18170&r1=18169&r2=18170&view=diff
==============================================================================
--- trunk/test_suite/gui_tests/bruker.py (original)
+++ trunk/test_suite/gui_tests/bruker.py Wed Dec 19 17:35:49 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'))