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 63EBB7D77 for ; Mon, 19 Dec 2011 13:46:04 +0000 (UTC) Received: (qmail 89551 invoked by uid 500); 19 Dec 2011 13:46:04 -0000 Delivered-To: apmail-subversion-commits-archive@subversion.apache.org Received: (qmail 89529 invoked by uid 500); 19 Dec 2011 13:46:04 -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 89522 invoked by uid 99); 19 Dec 2011 13:46:04 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 19 Dec 2011 13:46:04 +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, 19 Dec 2011 13:46:03 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id B69DA23888E7 for ; Mon, 19 Dec 2011 13:45:42 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1220742 - /subversion/trunk/subversion/tests/cmdline/copy_tests.py Date: Mon, 19 Dec 2011 13:45:42 -0000 To: commits@subversion.apache.org From: philip@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20111219134542.B69DA23888E7@eris.apache.org> Author: philip Date: Mon Dec 19 13:45:42 2011 New Revision: 1220742 URL: http://svn.apache.org/viewvc?rev=1220742&view=rev Log: * subversion/tests/cmdline/copy_tests.py (changed_dir_data_should_match_checkout): Fix spurious FAIL by not depending on status order. 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=1220742&r1=1220741&r2=1220742&view=diff ============================================================================== --- subversion/trunk/subversion/tests/cmdline/copy_tests.py (original) +++ subversion/trunk/subversion/tests/cmdline/copy_tests.py Mon Dec 19 13:45:42 2011 @@ -4654,9 +4654,15 @@ def changed_dir_data_should_match_checko os.chdir(was_cwd) os.chdir(wc_dir) - svntest.actions.run_and_verify_svn(None, verify_out, [], 'status', '-v') + rv, verify_out2, err = main.run_svn (None, 'status', '-v') os.chdir(was_cwd) + # The order of the staus output is not absolutely defined, but + # otherwise should match + svntest.verify.verify_outputs(None, + sorted(verify_out2), None, + sorted(verify_out), None) + def move_added_nodes(sbox): """move added nodes"""