r26060 - /trunk/test_suite/system_tests/bmrb.py -- September 26, 2014 - 15:06

Author: bugman
Date: Fri Sep 26 15:06:55 2014
New Revision: 26060

URL: http://svn.gna.org/viewcvs/relax?rev=26060&view=rev
Log:
Reverted r26053, as this is no longer the case.

The command used was:
svn merge -r26053:r26052 .

.....
  r26053 | bugman | 2014-09-26 11:44:00 +0200 (Fri, 26 Sep 2014) | 5 lines
  Changed paths:
     M /trunk/test_suite/system_tests/bmrb.py
  
  Updated the Bmrb.test_bug_22703_display_empty system/GUI test.
  
  The RelaxError type is now different.
.....


Modified:
    trunk/test_suite/system_tests/bmrb.py

Modified: trunk/test_suite/system_tests/bmrb.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/system_tests/bmrb.py?rev=26060&r1=26059&r2=26060&view=diff
==============================================================================
--- trunk/test_suite/system_tests/bmrb.py       (original)
+++ trunk/test_suite/system_tests/bmrb.py       Fri Sep 26 15:06:55 2014
@@ -30,7 +30,7 @@
 # relax module imports.
 from data_store import Relax_data_store; ds = Relax_data_store()
 import dep_check
-from lib.errors import RelaxError
+from lib.errors import RelaxError, RelaxNoFrqError
 from status import Status; status = Status()
 from test_suite.system_tests.base_classes import SystemTestCase
 
@@ -260,14 +260,14 @@
         self.interpreter.pipe.create('test', 'mf')
 
         # Display.
-        self.assertRaises(RelaxError, self.interpreter.bmrb.display, 
version='3.1')
+        self.assertRaises(RelaxNoFrqError, self.interpreter.bmrb.display, 
version='3.1')
 
         # Reset and create a new data pipe.
         self.interpreter.reset()
         self.interpreter.pipe.create('test2', 'mf')
 
         # Display again to show a GUI breakage.
-        self.assertRaises(RelaxError, self.interpreter.bmrb.display, 
version='3.1')
+        self.assertRaises(RelaxNoFrqError, self.interpreter.bmrb.display, 
version='3.1')
 
 
     def test_rw_bmrb_3_0_model_free(self):