You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by cm...@apache.org on 2012/08/09 18:16:07 UTC
svn commit: r1371282 -
/subversion/trunk/subversion/tests/cmdline/prop_tests.py
Author: cmpilato
Date: Thu Aug 9 16:16:07 2012
New Revision: 1371282
URL: http://svn.apache.org/viewvc?rev=1371282&view=rev
Log:
Fix a sandbox violation in prop_tests.py 35.
* subversion/tests/cmdline/prop_tests.py
(propget_redirection): Consult the controlled test-suite runtime
config when invoking 'svn' directly.
Modified:
subversion/trunk/subversion/tests/cmdline/prop_tests.py
Modified: subversion/trunk/subversion/tests/cmdline/prop_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/prop_tests.py?rev=1371282&r1=1371281&r2=1371282&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/prop_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/prop_tests.py Thu Aug 9 16:16:07 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()
Re: svn commit: r1371282 - /subversion/trunk/subversion/tests/cmdline/prop_tests.py
Posted by "C. Michael Pilato" <cm...@collab.net>.
On 08/10/2012 04:05 AM, Philip Martin wrote:
> Philip Martin <ph...@wandisco.com> writes:
>
>>> arglist = [svntest.main.svn_binary, 'propget', SVN_PROP_MERGEINFO, '-vR',
>>> - wc_dir]
>>> + '--config-dir', svntest.main.default_config_dir, wc_dir]
>>
>> The user should be able to avoid the FAIL by having the appropriate
>> settings in their config and I'd like to document it in the release
>> notes.
>>
>> I know that the test will be affected by a corrupt config. Is there a
>> config setting that affects propget? Was it your new password-store
>> that was unknown to 1.7?
>
> I see you said it was a 'trunkism' so I believe that means that any
> config that works with 1.7 will be sufficient for the test to PASS.
> The only people who see a FAIL will be those with a config that doesn't
> allow them to run 1.7.
Actually, it was the new gpg-agent password store from trunk, but yes, folks
using 1.7 with 1.7-compliant configs will be in fine shape.
--
C. Michael Pilato <cm...@collab.net>
CollabNet <> www.collab.net <> Enterprise Cloud Development
Re: svn commit: r1371282 - /subversion/trunk/subversion/tests/cmdline/prop_tests.py
Posted by Philip Martin <ph...@wandisco.com>.
Philip Martin <ph...@wandisco.com> writes:
>> arglist = [svntest.main.svn_binary, 'propget', SVN_PROP_MERGEINFO, '-vR',
>> - wc_dir]
>> + '--config-dir', svntest.main.default_config_dir, wc_dir]
>
> The user should be able to avoid the FAIL by having the appropriate
> settings in their config and I'd like to document it in the release
> notes.
>
> I know that the test will be affected by a corrupt config. Is there a
> config setting that affects propget? Was it your new password-store
> that was unknown to 1.7?
I see you said it was a 'trunkism' so I believe that means that any
config that works with 1.7 will be sufficient for the test to PASS.
The only people who see a FAIL will be those with a config that doesn't
allow them to run 1.7.
--
Certified & Supported Apache Subversion Downloads:
http://www.wandisco.com/subversion/download
Re: svn commit: r1371282 - /subversion/trunk/subversion/tests/cmdline/prop_tests.py
Posted by Philip Martin <ph...@wandisco.com>.
cmpilato@apache.org writes:
> Author: cmpilato
> Date: Thu Aug 9 16:16:07 2012
> New Revision: 1371282
>
> URL: http://svn.apache.org/viewvc?rev=1371282&view=rev
> Log:
> Fix a sandbox violation in prop_tests.py 35.
>
> * subversion/tests/cmdline/prop_tests.py
> (propget_redirection): Consult the controlled test-suite runtime
> config when invoking 'svn' directly.
>
> Modified:
> subversion/trunk/subversion/tests/cmdline/prop_tests.py
>
> Modified: subversion/trunk/subversion/tests/cmdline/prop_tests.py
> URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/prop_tests.py?rev=1371282&r1=1371281&r2=1371282&view=diff
> ==============================================================================
> --- subversion/trunk/subversion/tests/cmdline/prop_tests.py (original)
> +++ subversion/trunk/subversion/tests/cmdline/prop_tests.py Thu Aug 9 16:16:07 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]
The user should be able to avoid the FAIL by having the appropriate
settings in their config and I'd like to document it in the release
notes.
I know that the test will be affected by a corrupt config. Is there a
config setting that affects propget? Was it your new password-store
that was unknown to 1.7?
--
Philip