Author: bugman Date: Thu Nov 20 18:44:21 2014 New Revision: 26672 URL: http://svn.gna.org/viewcvs/relax?rev=26672&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/space_mapping_refactor/ (props changed) branches/space_mapping_refactor/test_suite/system_tests/structure.py Propchange: branches/space_mapping_refactor/ ------------------------------------------------------------------------------ --- svnmerge-integrated (original) +++ svnmerge-integrated Thu Nov 20 18:44:21 2014 @@ -1 +1 @@ -/trunk:1-26662 +/trunk:1-26666 Modified: branches/space_mapping_refactor/test_suite/system_tests/structure.py URL: http://svn.gna.org/viewcvs/relax/branches/space_mapping_refactor/test_suite/system_tests/structure.py?rev=26672&r1=26671&r2=26672&view=diff ============================================================================== --- branches/space_mapping_refactor/test_suite/system_tests/structure.py (original) +++ branches/space_mapping_refactor/test_suite/system_tests/structure.py Thu Nov 20 18:44:21 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):