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 3A50410E06 for ; Mon, 6 Jan 2014 04:04:45 +0000 (UTC) Received: (qmail 896 invoked by uid 500); 6 Jan 2014 04:04:34 -0000 Delivered-To: apmail-subversion-commits-archive@subversion.apache.org Received: (qmail 792 invoked by uid 500); 6 Jan 2014 04:04:27 -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 777 invoked by uid 99); 6 Jan 2014 04:04:24 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 06 Jan 2014 04:04:24 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 06 Jan 2014 04:04:22 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id D1E732388993; Mon, 6 Jan 2014 04:04:02 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1555651 - in /subversion/branches/1.7.x: ./ STATUS subversion/tests/cmdline/checkout_tests.py Date: Mon, 06 Jan 2014 04:04:02 -0000 To: commits@subversion.apache.org From: svn-role@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20140106040402.D1E732388993@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: svn-role Date: Mon Jan 6 04:04:01 2014 New Revision: 1555651 URL: http://svn.apache.org/r1555651 Log: Merge r1539309 from trunk: * r1539309 Fix test failure in checkout_tests.py after backporting of r1518184 to 1.7.x in r1538135. Justification: The extended regression test relied on test suite behavior in 1.8+, by not passing a disk tree. The easy fix is to just pass a disk tree. Votes: +1: rhuijben, jcorvel, stefan2 Modified: subversion/branches/1.7.x/ (props changed) subversion/branches/1.7.x/STATUS subversion/branches/1.7.x/subversion/tests/cmdline/checkout_tests.py Propchange: subversion/branches/1.7.x/ ------------------------------------------------------------------------------ Merged /subversion/trunk:r1539309 Modified: subversion/branches/1.7.x/STATUS URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/STATUS?rev=1555651&r1=1555650&r2=1555651&view=diff ============================================================================== --- subversion/branches/1.7.x/STATUS (original) +++ subversion/branches/1.7.x/STATUS Mon Jan 6 04:04:01 2014 @@ -112,12 +112,3 @@ Veto-blocked changes: Approved changes: ================= - * r1539309 - Fix test failure in checkout_tests.py after backporting of r1518184 - to 1.7.x in r1538135. - Justification: - The extended regression test relied on test suite behavior in 1.8+, - by not passing a disk tree. The easy fix is to just pass a disk tree. - Votes: - +1: rhuijben, jcorvel, stefan2 - Modified: subversion/branches/1.7.x/subversion/tests/cmdline/checkout_tests.py URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/subversion/tests/cmdline/checkout_tests.py?rev=1555651&r1=1555650&r2=1555651&view=diff ============================================================================== --- subversion/branches/1.7.x/subversion/tests/cmdline/checkout_tests.py (original) +++ subversion/branches/1.7.x/subversion/tests/cmdline/checkout_tests.py Mon Jan 6 04:04:01 2014 @@ -1109,8 +1109,25 @@ def checkout_wc_from_drive(sbox): 'B/F' : Item(status='A '), 'B/lambda' : Item(status='A '), }) + + expected_wc = wc.State('', { + 'C' : Item(), + 'B/E/beta' : Item(contents="This is the file 'beta'.\n"), + 'B/E/alpha' : Item(contents="This is the file 'alpha'.\n"), + 'B/lambda' : Item(contents="This is the file 'lambda'.\n"), + 'B/F' : Item(), + 'D/H/omega' : Item(contents="This is the file 'omega'.\n"), + 'D/H/psi' : Item(contents="This is the file 'psi'.\n"), + 'D/H/chi' : Item(contents="This is the file 'chi'.\n"), + 'D/G/rho' : Item(contents="This is the file 'rho'.\n"), + 'D/G/tau' : Item(contents="This is the file 'tau'.\n"), + 'D/G/pi' : Item(contents="This is the file 'pi'.\n"), + 'D/gamma' : Item(contents="This is the file 'gamma'.\n"), + 'mu' : Item(contents="This is the file 'mu'.\n"), + }) + svntest.actions.run_and_verify_checkout(repo_url + '/A', wc2_dir, - expected_output, None, + expected_output, expected_wc, None, None, None, None) wc3_dir = sbox.add_wc_path('3') @@ -1126,8 +1143,18 @@ def checkout_wc_from_drive(sbox): 'gamma' : Item(status='A '), }) + expected_wc = wc.State('', { + 'H/chi' : Item(contents="This is the file 'chi'.\n"), + 'H/psi' : Item(contents="This is the file 'psi'.\n"), + 'H/omega' : Item(contents="This is the file 'omega'.\n"), + 'G/pi' : Item(contents="This is the file 'pi'.\n"), + 'G/tau' : Item(contents="This is the file 'tau'.\n"), + 'G/rho' : Item(contents="This is the file 'rho'.\n"), + 'gamma' : Item(contents="This is the file 'gamma'.\n"), + }) + svntest.actions.run_and_verify_checkout(repo_url + '/A/D', wc3_dir, - expected_output, None, + expected_output, expected_wc, None, None, None, None) finally: