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 71C2287FD for ; Mon, 8 Aug 2011 12:11:34 +0000 (UTC) Received: (qmail 20224 invoked by uid 500); 8 Aug 2011 12:11:34 -0000 Delivered-To: apmail-subversion-commits-archive@subversion.apache.org Received: (qmail 19606 invoked by uid 500); 8 Aug 2011 12:11:30 -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 19599 invoked by uid 99); 8 Aug 2011 12:11:29 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 08 Aug 2011 12:11:29 +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, 08 Aug 2011 12:11:26 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id AEA6F238897D for ; Mon, 8 Aug 2011 12:11:06 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1154938 - /subversion/trunk/subversion/tests/cmdline/copy_tests.py Date: Mon, 08 Aug 2011 12:11:06 -0000 To: commits@subversion.apache.org From: stsp@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110808121106.AEA6F238897D@eris.apache.org> Author: stsp Date: Mon Aug 8 12:11:06 2011 New Revision: 1154938 URL: http://svn.apache.org/viewvc?rev=1154938&view=rev Log: * subversion/tests/cmdline/copy_tests.py (commit_copied_half_of_move, commit_deleted_half_of_move): Verify moved-to and moved-from paths shown in error messages. Modified: subversion/trunk/subversion/tests/cmdline/copy_tests.py Modified: subversion/trunk/subversion/tests/cmdline/copy_tests.py URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/copy_tests.py?rev=1154938&r1=1154937&r2=1154938&view=diff ============================================================================== --- subversion/trunk/subversion/tests/cmdline/copy_tests.py (original) +++ subversion/trunk/subversion/tests/cmdline/copy_tests.py Mon Aug 8 12:11:06 2011 @@ -5482,7 +5482,9 @@ def commit_copied_half_of_move(sbox): svntest.actions.run_and_verify_svn(None, None, [], 'mv', iota_path, D_path) - expected_error = "svn: E200009: Cannot commit" + expected_error = "svn: E200009: Cannot commit '.*%s' because it was moved " \ + "from '.*%s'" % (re.escape(os.path.join(D_path, "iota")), + re.escape(iota_path)) svntest.actions.run_and_verify_svn(None, None, expected_error, 'commit', '-m', 'foo', D_path) @@ -5536,7 +5538,9 @@ def commit_deleted_half_of_move(sbox): svntest.actions.run_and_verify_svn(None, None, [], 'mv', iota_path, D_path) - expected_error = "svn: E200009: Cannot commit" + expected_error = "svn: E200009: Cannot commit '.*%s' because it was moved " \ + "to '.*%s'" % (re.escape(iota_path), + re.escape(os.path.join(D_path, "iota"))) svntest.actions.run_and_verify_svn(None, None, expected_error, 'commit', '-m', 'foo', iota_path)