r26666 - in /branches/frame_order_cleanup: ./ test_suite/system_tests/structure.py -- November 20, 2014 - 15:49

Author: bugman
Date: Thu Nov 20 15:49:03 2014
New Revision: 26666

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

........
  r26665 | bugman | 2014-11-20 15:43:52 +0100 (Thu, 20 Nov 2014) | 5 lines
  
  Fix for the Structure.test_bug_22860_CoM_after_deletion system test for the 
previous commit.
  
  The error is no longer RelaxNoPdbError but rather RelaxError.
........

Modified:
    branches/frame_order_cleanup/   (props changed)
    branches/frame_order_cleanup/test_suite/system_tests/structure.py

Propchange: branches/frame_order_cleanup/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Thu Nov 20 15:49:03 2014
@@ -1 +1 @@
-/trunk:1-26662
+/trunk:1-26665

Modified: branches/frame_order_cleanup/test_suite/system_tests/structure.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/test_suite/system_tests/structure.py?rev=26666&r1=26665&r2=26666&view=diff
==============================================================================
--- branches/frame_order_cleanup/test_suite/system_tests/structure.py   
(original)
+++ branches/frame_order_cleanup/test_suite/system_tests/structure.py   Thu 
Nov 20 15:49:03 2014
@@ -376,7 +376,7 @@
         self.interpreter.structure.delete()
 
         # CoM.
-        self.assertRaises(RelaxNoPdbError, self.interpreter.structure.com)
+        self.assertRaises(RelaxError, self.interpreter.structure.com)
 
 
     def test_bug_22861_PDB_writing_chainID_fail(self):