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 62477D310 for ; Tue, 5 Mar 2013 12:02:48 +0000 (UTC) Received: (qmail 26325 invoked by uid 500); 5 Mar 2013 12:02:48 -0000 Delivered-To: apmail-subversion-commits-archive@subversion.apache.org Received: (qmail 26199 invoked by uid 500); 5 Mar 2013 12:02:47 -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 26185 invoked by uid 99); 5 Mar 2013 12:02:47 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 05 Mar 2013 12:02:47 +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; Tue, 05 Mar 2013 12:02:46 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id CE72E23889CB; Tue, 5 Mar 2013 12:02:26 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1452753 - /subversion/trunk/subversion/tests/cmdline/move_tests.py Date: Tue, 05 Mar 2013 12:02:26 -0000 To: commits@subversion.apache.org From: philip@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130305120226.CE72E23889CB@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: philip Date: Tue Mar 5 12:02:26 2013 New Revision: 1452753 URL: http://svn.apache.org/r1452753 Log: Give a test a more descriptive name. * subversion/tests/cmdline/move_tests.py (prop_test1): Rename to... (property_merge): ...this. (test_list): Update. Modified: subversion/trunk/subversion/tests/cmdline/move_tests.py Modified: subversion/trunk/subversion/tests/cmdline/move_tests.py URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/move_tests.py?rev=1452753&r1=1452752&r2=1452753&view=diff ============================================================================== --- subversion/trunk/subversion/tests/cmdline/move_tests.py (original) +++ subversion/trunk/subversion/tests/cmdline/move_tests.py Tue Mar 5 12:02:26 2013 @@ -1027,7 +1027,7 @@ def deeper_move_file_test(sbox): move_file_tests(sbox, source, dest, move_func, tests) -def prop_test1(sbox): +def property_merge(sbox): "test property merging on move-update" # pristine local incoming outcome revert @@ -1201,7 +1201,7 @@ test_list = [ None, sibling_move_file_test, shallower_move_file_test, deeper_move_file_test, - prop_test1, + property_merge, ] if __name__ == '__main__':