Author: bugman
Date: Fri Sep 26 19:32:29 2014
New Revision: 26081
URL: http://svn.gna.org/viewcvs/relax?rev=26081&view=rev
Log:
Merged revisions 26069-26070 via svnmerge from
svn+ssh://[email protected]/svn/relax/trunk
........
r26069 | bugman | 2014-09-26 18:19:27 +0200 (Fri, 26 Sep 2014) | 5 lines
Added checks to the Bmrb.test_bug_22704_corrupted_state_file system test.
This is to see if the cdp.exp_info data structure has been correctly restored
from the save file.
........
r26070 | bugman | 2014-09-26 18:24:44 +0200 (Fri, 26 Sep 2014) | 3 lines
Uncommented some checks in the Bmrb.test_bug_22704_corrupted_state_file
system test.
........
Modified:
branches/frame_order_cleanup/ (props changed)
branches/frame_order_cleanup/test_suite/system_tests/bmrb.py
Propchange: branches/frame_order_cleanup/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Fri Sep 26 19:32:29 2014
@@ -1 +1 @@
-/trunk:1-26017,26043-26068
+/trunk:1-26017,26043-26070
Modified: branches/frame_order_cleanup/test_suite/system_tests/bmrb.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/test_suite/system_tests/bmrb.py?rev=26081&r1=26080&r2=26081&view=diff
==============================================================================
--- branches/frame_order_cleanup/test_suite/system_tests/bmrb.py
(original)
+++ branches/frame_order_cleanup/test_suite/system_tests/bmrb.py Fri Sep
26 19:32:29 2014
@@ -287,6 +287,19 @@
self.interpreter.reset()
self.interpreter.state.load('corrupted_state', dir=self.tmpdir)
+ # Checks.
+ self.assert_(hasattr(cdp, 'exp_info'))
+ self.assert_(hasattr(cdp.exp_info, 'software'))
+ self.assertEqual(len(cdp.exp_info.software), 1)
+ self.assertEqual(cdp.exp_info.software[0].name, 'software')
+ self.assertEqual(cdp.exp_info.software[0].desc, 'Software program used
in the analysis')
+ self.assertEqual(cdp.exp_info.software[0].software_name, 'relax')
+ self.assertEqual(cdp.exp_info.software[0].version, None)
+ self.assertEqual(cdp.exp_info.software[0].url, None)
+ self.assertEqual(cdp.exp_info.software[0].vendor_name, None)
+ self.assertEqual(cdp.exp_info.software[0].cite_ids, None)
+ self.assertEqual(cdp.exp_info.software[0].tasks, None)
+
def test_rw_bmrb_3_0_model_free(self):
"""Write and then read a BRMB STAR formatted file containing
model-free results."""
_______________________________________________
relax (http://www.nmr-relax.com)
This is the relax-commits mailing list
[email protected]
To unsubscribe from this list, get a password
reminder, or change your subscription options,
visit the list information page at
https://mail.gna.org/listinfo/relax-commits
