r20212 - in /branches/relax_disp: ./ devel_scripts/ test_suite/system_tests/ -- June 19, 2013 - 11:40

Author: bugman
Date: Wed Jun 19 11:40:33 2013
New Revision: 20212

URL: http://svn.gna.org/viewcvs/relax?rev=20212&view=rev
Log:
Merged revisions 20208-20209,20211 via svnmerge from 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/trunk

........
  r20208 | bugman | 2013-06-19 11:04:30 +0200 (Wed, 19 Jun 2013) | 5 lines
  
  Added the scripts for backing up the relax SVN repository and mailing lists 
to the repository.
  
  This is to make it easier for others to set up the backups on their systems.
........
  r20209 | bugman | 2013-06-19 11:09:42 +0200 (Wed, 19 Jun 2013) | 3 lines
  
  Added comments to the backup scripts to make it easier to use them.
........
  r20211 | bugman | 2013-06-19 11:39:06 +0200 (Wed, 19 Jun 2013) | 9 lines
  
  More MS Windows fixes, this time a nasty kludge, for the relax system tests.
  
  This is strangely needed for the relax_disp branch and not the trunk for a 
64-bit MS Windows 7 test
  system.  The reason why this WindowsError is triggered by the base 
tearDown() method in the
  relax_disp branch and not trunk is a total mystery.  Actually why Windows 
refuses to complete the
  file close() operations of the results.write and state.save user functions 
before calling the
  tearDown() method is the greater mystery.
........

Added:
    branches/relax_disp/devel_scripts/backup_mailing_lists
      - copied unchanged from r20211, trunk/devel_scripts/backup_mailing_lists
    branches/relax_disp/devel_scripts/backup_repository
      - copied unchanged from r20211, trunk/devel_scripts/backup_repository
Modified:
    branches/relax_disp/   (props changed)
    branches/relax_disp/test_suite/system_tests/base_classes.py

Propchange: branches/relax_disp/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Wed Jun 19 11:40:33 2013
@@ -1,1 +1,1 @@
-/trunk:1-20202
+/trunk:1-20211

Modified: branches/relax_disp/test_suite/system_tests/base_classes.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/relax_disp/test_suite/system_tests/base_classes.py?rev=20212&r1=20211&r2=20212&view=diff
==============================================================================
--- branches/relax_disp/test_suite/system_tests/base_classes.py (original)
+++ branches/relax_disp/test_suite/system_tests/base_classes.py Wed Jun 19 
11:40:33 2013
@@ -67,6 +67,9 @@
     def tearDown(self):
         """Default tearDown operation - delete temp directories and files 
and reset relax."""
 
+        # Horrible MS Windows kludge - avoid the WindowsError due to the 
file still being open by the state.save or results.write user functions.
+        sleep(0.03)
+
         # Remove the temporary directories.
         if hasattr(ds, 'tmpdir'):
             # Delete the directory.
@@ -85,9 +88,6 @@
 
         # Remove temporary files.
         if hasattr(ds, 'tmpfile'):
-            # MS Windows kludge - avoid the WindowsError due to the file 
still being open by the state.save or results.write user functions.
-            sleep(0.01)
-
             # Delete the file.
             delete(ds.tmpfile, fail=False)
 
@@ -96,9 +96,6 @@
 
         # Remove temporary files.
         if hasattr(self, 'tmpfile'):
-            # MS Windows kludge - avoid the WindowsError due to the file 
still being open by the state.save or results.write user functions.
-            sleep(0.01)
-
             # Delete the file.
             delete(self.tmpfile, fail=False)