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 2012/08/10 06:03:30 UTC
svn commit: r1371558 - in /subversion/branches/1.7.x: ./ STATUS
subversion/tests/cmdline/prop_tests.py
Author: svn-role
Date: Fri Aug 10 04:03:30 2012
New Revision: 1371558
URL: http://svn.apache.org/viewvc?rev=1371558&view=rev
Log:
Merge r1371282 from trunk:
* r1371282
Fix a sandbox violation in a test suite test. (The test executes
'svn' outside the typical framework for doing so without pointing
the binary at the controlled runtime configuration directory used
by other tests.)
Justification:
Broken tests lead to false positives in the hunt for broken
software.
Votes:
+1: cmpilato, brane, julianfoad
Modified:
subversion/branches/1.7.x/ (props changed)
subversion/branches/1.7.x/STATUS
subversion/branches/1.7.x/subversion/tests/cmdline/prop_tests.py
Propchange: subversion/branches/1.7.x/
------------------------------------------------------------------------------
Merged /subversion/trunk:r1371282
Modified: subversion/branches/1.7.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/STATUS?rev=1371558&r1=1371557&r2=1371558&view=diff
==============================================================================
--- subversion/branches/1.7.x/STATUS (original)
+++ subversion/branches/1.7.x/STATUS Fri Aug 10 04:03:30 2012
@@ -75,14 +75,3 @@ Veto-blocked changes:
Approved changes:
=================
-
- * r1371282
- Fix a sandbox violation in a test suite test. (The test executes
- 'svn' outside the typical framework for doing so without pointing
- the binary at the controlled runtime configuration directory used
- by other tests.)
- Justification:
- Broken tests lead to false positives in the hunt for broken
- software.
- Votes:
- +1: cmpilato, brane, julianfoad
Modified: subversion/branches/1.7.x/subversion/tests/cmdline/prop_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/subversion/tests/cmdline/prop_tests.py?rev=1371558&r1=1371557&r2=1371558&view=diff
==============================================================================
--- subversion/branches/1.7.x/subversion/tests/cmdline/prop_tests.py (original)
+++ subversion/branches/1.7.x/subversion/tests/cmdline/prop_tests.py Fri Aug 10 04:03:30 2012
@@ -2268,7 +2268,7 @@ def propget_redirection(sbox):
# Run propget -vR svn:mergeinfo, redirecting the stdout to a file.
arglist = [svntest.main.svn_binary, 'propget', SVN_PROP_MERGEINFO, '-vR',
- wc_dir]
+ '--config-dir', svntest.main.default_config_dir, wc_dir]
redir_file = open(redirect_file, 'wb')
pg_proc = subprocess.Popen(arglist, stdout=redir_file)
pg_proc.wait()