svn commit: r904055 - /subversion/trunk/subversion/tests/cmdline/upgrade_tests.py

[ph...@apache.org]

Author: philip
Date: Thu Jan 28 12:12:51 2010
New Revision: 904055

URL: http://svn.apache.org/viewvc?rev=904055&view=rev
Log:
Make tarfile extraction in the upgrade tests work in parallel mode.

* subversion/tests/cmdline/upgrade_tests.py
  (replace_sbox_with_tarfile): Use a unique temporary directory.

Modified:
    subversion/trunk/subversion/tests/cmdline/upgrade_tests.py

Modified: subversion/trunk/subversion/tests/cmdline/upgrade_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/upgrade_tests.py?rev=904055&r1=904054&r2=904055&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/upgrade_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/upgrade_tests.py Thu Jan 28 12:12:51 2010
@@ -34,6 +34,7 @@
 import shutil
 import sys
 import tarfile
+import tempfile
 
 import svntest
 
@@ -60,10 +61,11 @@
   tarpath = os.path.join(os.path.dirname(sys.argv[0]), 'upgrade_tests_data',
                          tar_filename)
   t = tarfile.open(tarpath, 'r:bz2')
+  extract_dir = tempfile.mkdtemp(dir=svntest.main.temp_dir)
   for member in t.getmembers():
-    t.extract(member, svntest.main.temp_dir)
+    t.extract(member, extract_dir)
 
-  shutil.move(os.path.join(svntest.main.temp_dir, tar_filename.split('.')[0]),
+  shutil.move(os.path.join(extract_dir, tar_filename.split('.')[0]),
               sbox.wc_dir)