r26077 - in /branches/frame_order_cleanup: ./ test_suite/system_tests/bmrb.py -- September 26, 2014 - 19:22

Author: bugman
Date: Fri Sep 26 19:22:51 2014
New Revision: 26077

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

........
  r26063 | bugman | 2014-09-26 16:36:13 +0200 (Fri, 26 Sep 2014) | 6 lines
  
  Created the Bmrb.test_bug_22704_corrupted_state_file system test.
  
  This is to catch bug #22704 (https://gna.org/bugs/?22704), the corrupted 
relax state files after
  setting the relax references via the bmrb.software, bmrb.display, or 
bmrb.write user functions.
........

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:22:51 2014
@@ -1 +1 @@
-/trunk:1-26017,26043-26062
+/trunk:1-26017,26043-26063

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=26077&r1=26076&r2=26077&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:22:51 2014
@@ -25,7 +25,7 @@
 from numpy import ndarray
 from os import sep
 from re import search
-from tempfile import mktemp
+from tempfile import mkdtemp, mktemp
 
 # relax module imports.
 from data_store import Relax_data_store; ds = Relax_data_store()
@@ -59,6 +59,9 @@
 
         # Create a temporary file name.
         ds.tmpfile = mktemp()
+
+        # Create a temporary directory for dumping files.
+        self.tmpdir = mkdtemp()
 
 
     def data_check(self, old_pipe_name='results', new_pipe_name='new', 
version=None):
@@ -270,6 +273,21 @@
         self.assertRaises(RelaxNoFrqError, self.interpreter.bmrb.display, 
version='3.1')
 
 
+    def test_bug_22704_corrupted_state_file(self):
+        """Catch U{bug #22704<https://gna.org/bugs/?22704>}, the corrupted 
relax state files."""
+
+        # Create the data pipe.
+        self.interpreter.pipe.create('test', 'mf')
+
+        # Set the relax references.
+        self.interpreter.bmrb.software('relax')
+
+        # Save the relax state, reset, and try loading it again.
+        self.interpreter.state.save('corrupted_state', dir=self.tmpdir)
+        self.interpreter.reset()
+        self.interpreter.state.load('corrupted_state', dir=self.tmpdir)
+
+
     def test_rw_bmrb_3_0_model_free(self):
         """Write and then read a BRMB STAR formatted file containing 
model-free results."""