Return-Path: X-Original-To: apmail-subversion-commits-archive@minotaur.apache.org Delivered-To: apmail-subversion-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 7B7B51873B for ; Tue, 9 Jun 2015 04:00:28 +0000 (UTC) Received: (qmail 77407 invoked by uid 500); 9 Jun 2015 04:00:28 -0000 Delivered-To: apmail-subversion-commits-archive@subversion.apache.org Received: (qmail 77377 invoked by uid 500); 9 Jun 2015 04:00:28 -0000 Mailing-List: contact commits-help@subversion.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@subversion.apache.org Delivered-To: mailing list commits@subversion.apache.org Received: (qmail 77366 invoked by uid 99); 9 Jun 2015 04:00:28 -0000 Received: from eris.apache.org (HELO hades.apache.org) (140.211.11.105) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 09 Jun 2015 04:00:28 +0000 Received: from hades.apache.org (localhost [127.0.0.1]) by hades.apache.org (ASF Mail Server at hades.apache.org) with ESMTP id 2DB50AC00B4 for ; Tue, 9 Jun 2015 04:00:28 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1684308 - in /subversion/branches/1.9.x: ./ STATUS subversion/tests/cmdline/prop_tests.py Date: Tue, 09 Jun 2015 04:00:27 -0000 To: commits@subversion.apache.org From: svn-role@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20150609040028.2DB50AC00B4@hades.apache.org> Author: svn-role Date: Tue Jun 9 04:00:27 2015 New Revision: 1684308 URL: http://svn.apache.org/r1684308 Log: Merge r1684034 from trunk: * r1684034 Fix prop_tests.py#42 test failures with non-US default locale on Windows [1]. Justification: Tests should not fail. Votes: +1: ivan, rhuijben Modified: subversion/branches/1.9.x/ (props changed) subversion/branches/1.9.x/STATUS subversion/branches/1.9.x/subversion/tests/cmdline/prop_tests.py Propchange: subversion/branches/1.9.x/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Jun 9 04:00:27 2015 @@ -93,4 +93,4 @@ /subversion/branches/verify-at-commit:1462039-1462408 /subversion/branches/verify-keep-going:1439280-1546110 /subversion/branches/wc-collate-path:1402685-1480384 -/subversion/trunk:1660545-1660547,1660549-1662901,1663003,1663183-1663184,1663338,1663347,1663355,1663374,1663450,1663530,1663671,1663697,1663706,1663738,1663749,1663791,1663991,1664035,1664078,1664080,1664084-1664085,1664187,1664191,1664193,1664200,1664344,1664476,1664480-1664481,1664483,1664489-1664490,1664507,1664520-1664521,1664523,1664526-1664527,1664531-1664532,1664588,1664593-1664594,1664596,1664653,1664664,1664672,1664674,1664684,1664927,1664938-1664940,1664978,1664984,1664997,1665164,1665195,1665213,1665259,1665318,1665437-1665438,1665609,1665611-1665612,1665845,1665850,1665852,1665886,1665894,1665896,1666096,1666258,1666270,1666272,1666379,1666449,1666690,1666832,1666851,1666965,1667101,1667106-1667107,1667120,1667228,1667233-1667235,1667249-1667250,1667258,1667290,1667301,1667471,1667691-1667693,1667699-1667700,1667715,1667941,1667976,1668320,1668598-1668600,1668602-1668603,1668607-1668608,1668618,1669743,1669746,1669749,1669945,1670139,1670149,1670152,1670329,1670337,167 0347,1670353,1671164,1671388,1672295,1672311,1672372,1672404,1672511-1672512,1672578,1672728,1673044,1673062-1673063,1673065,1673153,1673170,1673172,1673197,1673202,1673204,1673228,1673282,1673445,1673691-1673692,1673746,1673785,1673803,1674015,1674032,1674170,1674301,1674305,1674308,1674339-1674340,1674406,1674415,1674455-1674456,1674475,1674487,1674522,1674580,1674627,1674891,1675771,1675774,1676526,1676535,1676538,1676555,1676564,1676570,1676665,1676667,1676769,1677003,1677191,1677267,1677440,1678147,1678149,1678494,1678571,1678734,1678742,1678745-1678746,1678839,1678846,1678894,1678950,1678963,1679166,1679169,1679228,1679230,1679287,1679864,1679866,1679909,1680242,1680264,1680495,1680705,1680819,1681317,1683071,1683311,1683387 +/subversion/trunk:1660545-1660547,1660549-1662901,1663003,1663183-1663184,1663338,1663347,1663355,1663374,1663450,1663530,1663671,1663697,1663706,1663738,1663749,1663791,1663991,1664035,1664078,1664080,1664084-1664085,1664187,1664191,1664193,1664200,1664344,1664476,1664480-1664481,1664483,1664489-1664490,1664507,1664520-1664521,1664523,1664526-1664527,1664531-1664532,1664588,1664593-1664594,1664596,1664653,1664664,1664672,1664674,1664684,1664927,1664938-1664940,1664978,1664984,1664997,1665164,1665195,1665213,1665259,1665318,1665437-1665438,1665609,1665611-1665612,1665845,1665850,1665852,1665886,1665894,1665896,1666096,1666258,1666270,1666272,1666379,1666449,1666690,1666832,1666851,1666965,1667101,1667106-1667107,1667120,1667228,1667233-1667235,1667249-1667250,1667258,1667290,1667301,1667471,1667691-1667693,1667699-1667700,1667715,1667941,1667976,1668320,1668598-1668600,1668602-1668603,1668607-1668608,1668618,1669743,1669746,1669749,1669945,1670139,1670149,1670152,1670329,1670337,167 0347,1670353,1671164,1671388,1672295,1672311,1672372,1672404,1672511-1672512,1672578,1672728,1673044,1673062-1673063,1673065,1673153,1673170,1673172,1673197,1673202,1673204,1673228,1673282,1673445,1673691-1673692,1673746,1673785,1673803,1674015,1674032,1674170,1674301,1674305,1674308,1674339-1674340,1674406,1674415,1674455-1674456,1674475,1674487,1674522,1674580,1674627,1674891,1675771,1675774,1676526,1676535,1676538,1676555,1676564,1676570,1676665,1676667,1676769,1677003,1677191,1677267,1677440,1678147,1678149,1678494,1678571,1678734,1678742,1678745-1678746,1678839,1678846,1678894,1678950,1678963,1679166,1679169,1679228,1679230,1679287,1679864,1679866,1679909,1680242,1680264,1680495,1680705,1680819,1681317,1683071,1683311,1683387,1684034 Modified: subversion/branches/1.9.x/STATUS URL: http://svn.apache.org/viewvc/subversion/branches/1.9.x/STATUS?rev=1684308&r1=1684307&r2=1684308&view=diff ============================================================================== --- subversion/branches/1.9.x/STATUS (original) +++ subversion/branches/1.9.x/STATUS Tue Jun 9 04:00:27 2015 @@ -67,11 +67,3 @@ Veto-blocked changes: Approved changes: ================= - - * r1684034 - Fix prop_tests.py#42 test failures with non-US default locale on - Windows [1]. - Justification: - Tests should not fail. - Votes: - +1: ivan, rhuijben Modified: subversion/branches/1.9.x/subversion/tests/cmdline/prop_tests.py URL: http://svn.apache.org/viewvc/subversion/branches/1.9.x/subversion/tests/cmdline/prop_tests.py?rev=1684308&r1=1684307&r2=1684308&view=diff ============================================================================== --- subversion/branches/1.9.x/subversion/tests/cmdline/prop_tests.py (original) +++ subversion/branches/1.9.x/subversion/tests/cmdline/prop_tests.py Tue Jun 9 04:00:27 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 = [ + '\n', + '\n', + '\n' % sbox.repo_url, + '\n', + 'A\n', + '\n', + '%s\n' % expected_author, + '2000-01-01T12:00:00.000000Z\n', + '\n', + '\n', + '\n', + 'iota\n', + '25\n', + '\n', + '%s\n' % expected_author, + '2000-01-01T12:00:00.000000Z\n', + '\n', + '\n', + '\n', + '\n' + ] + svntest.actions.run_and_verify_svn(expected_output, [], - 'ls', '-v', repo_url) + 'ls', '--xml', repo_url) expected_info = [{ 'Repository Root' : sbox.repo_url,