Author: ivan Date: Sun Jun 7 14:31:56 2015 New Revision: 1684034 URL: http://svn.apache.org/r1684034 Log: Fix prop_tests.py#42 test failures with non-US default locale on Windows [1].
[1] http://svn.haxx.se/dev/archive-2015-02/0098.shtml * subversion/tests/cmdline/prop_tests.py (xml_unsafe_author2):Use 'svn ls' with --xml flag to test locale independent output. 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=1684034&r1=1684033&r2=1684034&view=diff ============================================================================== --- subversion/trunk/subversion/tests/cmdline/prop_tests.py (original) +++ subversion/trunk/subversion/tests/cmdline/prop_tests.py Sun Jun 7 14:31:56 2015 @@ -2666,13 +2666,37 @@ def xml_unsafe_author2(sbox): else: expected_author = 'foo\bbar' - expected_output = svntest.verify.UnorderedOutput([ - ' 1 %-8s Jan 01 2000 ./\n' % expected_author, - ' 1 %-8s Jan 01 2000 A/\n' % expected_author, - ' 1 %-8s 25 Jan 01 2000 iota\n' % expected_author - ]) + # Use svn ls in --xml mode to test locale independent output. + expected_output = [ + '<?xml version="1.0" encoding="UTF-8"?>\n', + '<lists>\n', + '<list\n', + ' path="%s">\n' % sbox.repo_url, + '<entry\n', + ' kind="dir">\n', + '<name>A</name>\n', + '<commit\n', + ' revision="1">\n', + '<author>%s</author>\n' % expected_author, + '<date>2000-01-01T12:00:00.000000Z</date>\n', + '</commit>\n', + '</entry>\n', + '<entry\n', + ' kind="file">\n', + '<name>iota</name>\n', + '<size>25</size>\n', + '<commit\n', + ' revision="1">\n', + '<author>%s</author>\n' % expected_author, + '<date>2000-01-01T12:00:00.000000Z</date>\n', + '</commit>\n', + '</entry>\n', + '</list>\n', + '</lists>\n' + ] + svntest.actions.run_and_verify_svn(expected_output, [], - 'ls', '-v', repo_url) + 'ls', '--xml', repo_url) expected_info = [{ 'Repository Root' : sbox.repo_url,
