Author: bugman Date: Thu Oct 23 12:02:30 2014 New Revision: 26375 URL: http://svn.gna.org/viewcvs/relax?rev=26375&view=rev Log: Merged revisions 26373 via svnmerge from svn+ssh://bugman@xxxxxxxxxxx/svn/relax/trunk ........ r26373 | bugman | 2014-10-23 12:00:29 +0200 (Thu, 23 Oct 2014) | 6 lines Modified the Structure.test_bug_22860_CoM_after_deletion system test to expect a RelaxNoPdbError. This tests that the structure.com user function raises RelaxNoPdbError after deleting all of the structural information from the current data pipe. ........ 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 Oct 23 12:02:30 2014 @@ -1 +1 @@ -/trunk:1-26370 +/trunk:1-26370,26373 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=26375&r1=26374&r2=26375&view=diff ============================================================================== --- branches/space_mapping_refactor/test_suite/system_tests/structure.py (original) +++ branches/space_mapping_refactor/test_suite/system_tests/structure.py Thu Oct 23 12:02:30 2014 @@ -31,7 +31,7 @@ from data_store import Relax_data_store; ds = Relax_data_store() from pipe_control.mol_res_spin import count_spins, return_spin, spin_loop from lib.geometry.rotations import axis_angle_to_R, euler_to_R_zyz -from lib.errors import RelaxError +from lib.errors import RelaxError, RelaxNoPdbError from lib.io import DummyFileObject from status import Status; status = Status() from test_suite.system_tests.base_classes import SystemTestCase @@ -376,7 +376,7 @@ self.interpreter.structure.delete() # CoM. - self.interpreter.structure.com() + self.assertRaises(RelaxNoPdbError, self.interpreter.structure.com) def test_collapse_ensemble(self):