Backport?
On May 12, 2010 2:18 PM, <danielsh_at_apache.org> wrote:
Author: danielsh
Date: Wed May 12 18:18:03 2010
New Revision: 943609
URL: http://svn.apache.org/viewvc?rev=943609&view=rev
Log:
Fix special_tests 15: normalize "svn:special"'s value.
* subversion/libsvn_wc/props.c
(svn_wc_canonicalize_svn_prop):
Normalize SVN_PROP_SPECIAL along with the other boolean svn:* properties.
* subversion/tests/cmdline/special_tests.py
(test_list): Expect propvalue_normalized() to pass.
(propvalue_normalized): Tweak expected output so it's interpreted as
a string match rather than a regex match.
Modified:
subversion/trunk/subversion/libsvn_wc/props.c
subversion/trunk/subversion/tests/cmdline/special_tests.py
Modified: subversion/trunk/subversion/libsvn_wc/props.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/props.c?rev=943609&r1=943608&r2=943609&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/props.c (original)
+++ subversion/trunk/subversion/libsvn_wc/props.c Wed May 12 18:18:03 2010
@@ -2571,9 +2571,9 @@ svn_wc_canonicalize_svn_prop(const svn_s
new_value = svn_stringbuf_create_from_string(propval, pool);
svn_stringbuf_strip_whitespace(new_value);
}
- else if (strcmp(propname, SVN_PROP_EXECUTABLE) == 0
- || strcmp(propname, SVN_PROP_NEEDS_LOCK) == 0)
+ else if (svn_prop_is_boolean(propname))
{
+ /* SVN_PROP_EXECUTABLE, SVN_PROP_NEEDS_LOCK, SVN_PROP_SPECIAL */
new_value = svn_stringbuf_create_from_string(&boolean_value, pool);
}
else if (strcmp(propname, SVN_PROP_MERGEINFO) == 0)
Modified: subversion/trunk/subversion/tests/cmdline/special_tests.py
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/special_tests.py?rev=943609&r1=943608&r2=943609&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/special_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/special_tests.py Wed May 12
18:18:03 2010
@@ -641,7 +641,8 @@ def propvalue_normalized(sbox):
svntest.main.run_svn(None, 'propset', 'svn:special', 'yes', iota2_path)
# Property value should be SVN_PROP_BOOLEAN_TRUE
- svntest.actions.run_and_verify_svn(None, '*', [],
+ expected_propval = ['*']
+ svntest.actions.run_and_verify_svn(None, expected_propval, [],
'propget', '--strict', 'svn:special',
iota2_path)
@@ -658,7 +659,7 @@ def propvalue_normalized(sbox):
wc_dir)
svntest.main.run_svn(None, 'update')
- svntest.actions.run_and_verify_svn(None, '*', [],
+ svntest.actions.run_and_verify_svn(None, expected_propval, [],
'propget', '--strict', 'svn:special',
iota2_path)
@@ -685,7 +686,7 @@ test_list = [ None,
replace_symlink_with_dir,
SkipUnless(update_obstructing_symlink,
svntest.main.is_posix_os),
warn_on_reserved_name,
- Skip(XFail(propvalue_normalized), svntest.main.is_posix_os),
+ Skip(propvalue_normalized, svntest.main.is_posix_os),
]
if __name__ == '__main__':
Received on 2010-05-12 20:47:09 CEST