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 913287487 for ; Fri, 11 Nov 2011 12:16:43 +0000 (UTC) Received: (qmail 5393 invoked by uid 500); 11 Nov 2011 12:16:43 -0000 Delivered-To: apmail-subversion-commits-archive@subversion.apache.org Received: (qmail 5368 invoked by uid 500); 11 Nov 2011 12:16:43 -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 5361 invoked by uid 99); 11 Nov 2011 12:16:43 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 11 Nov 2011 12:16:43 +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; Fri, 11 Nov 2011 12:16:42 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 6411D238897F for ; Fri, 11 Nov 2011 12:16:22 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1200842 - /subversion/trunk/subversion/tests/cmdline/svntest/actions.py Date: Fri, 11 Nov 2011 12:16:22 -0000 To: commits@subversion.apache.org From: julianfoad@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20111111121622.6411D238897F@eris.apache.org> Author: julianfoad Date: Fri Nov 11 12:16:21 2011 New Revision: 1200842 URL: http://svn.apache.org/viewvc?rev=1200842&view=rev Log: * subversion/tests/cmdline/svntest/actions.py (run_and_verify_mergeinfo): Don't sort the output of 'svn mergeinfo', as it should be sorted already and by assuming that we can catch bugs such as the one fixed by r1200789. Modified: subversion/trunk/subversion/tests/cmdline/svntest/actions.py Modified: subversion/trunk/subversion/tests/cmdline/svntest/actions.py URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svntest/actions.py?rev=1200842&r1=1200841&r2=1200842&view=diff ============================================================================== --- subversion/trunk/subversion/tests/cmdline/svntest/actions.py (original) +++ subversion/trunk/subversion/tests/cmdline/svntest/actions.py Fri Nov 11 12:16:21 2011 @@ -1258,7 +1258,7 @@ def run_and_verify_mergeinfo(error_re_st verify.verify_outputs(None, None, err, None, expected_err) return - out = sorted([_f for _f in [x.rstrip()[1:] for x in out] if _f]) + out = [_f for _f in [x.rstrip()[1:] for x in out] if _f] expected_output.sort() extra_out = [] if out != expected_output: