You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by sv...@apache.org on 2014/02/18 05:00:09 UTC
svn commit: r1569177 - in /subversion/branches/1.8.x: ./ STATUS
subversion/tests/cmdline/autoprop_tests.py
Author: svn-role
Date: Tue Feb 18 04:00:08 2014
New Revision: 1569177
URL: http://svn.apache.org/r1569177
Log:
Merge r1567752 from trunk:
* r1567752
Fix, very occasional, spurious FAIL in autoprop_tests.py.
Justification:
Spurious FAILs confuse people.
Votes:
+1: philip, breser, brane
+0: rhuijben (The patch is ok, but there is a better version on trunk)
Modified:
subversion/branches/1.8.x/ (props changed)
subversion/branches/1.8.x/STATUS
subversion/branches/1.8.x/subversion/tests/cmdline/autoprop_tests.py
Propchange: subversion/branches/1.8.x/
------------------------------------------------------------------------------
Merged /subversion/trunk:r1567752
Modified: subversion/branches/1.8.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x/STATUS?rev=1569177&r1=1569176&r2=1569177&view=diff
==============================================================================
--- subversion/branches/1.8.x/STATUS (original)
+++ subversion/branches/1.8.x/STATUS Tue Feb 18 04:00:08 2014
@@ -217,14 +217,6 @@ Veto-blocked changes:
Approved changes:
=================
- * r1567752
- Fix, very occasional, spurious FAIL in autoprop_tests.py.
- Justification:
- Spurious FAILs confuse people.
- Votes:
- +1: philip, breser, brane
- +0: rhuijben (The patch is ok, but there is a better version on trunk)
-
* r1568872
Justification:
Fixes an API implementation bug in ra_serf.
Modified: subversion/branches/1.8.x/subversion/tests/cmdline/autoprop_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x/subversion/tests/cmdline/autoprop_tests.py?rev=1569177&r1=1569176&r2=1569177&view=diff
==============================================================================
--- subversion/branches/1.8.x/subversion/tests/cmdline/autoprop_tests.py (original)
+++ subversion/branches/1.8.x/subversion/tests/cmdline/autoprop_tests.py Tue Feb 18 04:00:08 2014
@@ -102,7 +102,9 @@ def autoprops_test(sbox, cmd, cfgenable,
# some directories
wc_dir = sbox.wc_dir
- tmp_dir = os.path.abspath(svntest.main.temp_dir)
+ tmp_dir = os.path.join(os.path.abspath(svntest.main.temp_dir), sbox.name)
+ if not os.path.isdir(tmp_dir):
+ os.makedirs(tmp_dir)
config_dir = os.path.join(tmp_dir, 'autoprops_config_' + sbox.name)
repos_url = sbox.repo_url