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 3EF1F916B for ; Mon, 19 Mar 2012 15:06:42 +0000 (UTC) Received: (qmail 23009 invoked by uid 500); 19 Mar 2012 15:06:42 -0000 Delivered-To: apmail-subversion-commits-archive@subversion.apache.org Received: (qmail 22984 invoked by uid 500); 19 Mar 2012 15:06:42 -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 22977 invoked by uid 99); 19 Mar 2012 15:06:42 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 19 Mar 2012 15:06:42 +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 Mar 2012 15:06:41 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 1E49C2388865; Mon, 19 Mar 2012 15:06:21 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1302499 - /subversion/trunk/subversion/tests/cmdline/tree_conflict_tests.py Date: Mon, 19 Mar 2012 15:06:21 -0000 To: commits@subversion.apache.org From: rhuijben@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120319150621.1E49C2388865@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: rhuijben Date: Mon Mar 19 15:06:20 2012 New Revision: 1302499 URL: http://svn.apache.org/viewvc?rev=1302499&view=rev Log: * subversion/tests/cmdline/tree_conflict_tests.py (actual_only_node_behaviour): Following up on r1302450, make error regex less strict. Modified: subversion/trunk/subversion/tests/cmdline/tree_conflict_tests.py Modified: subversion/trunk/subversion/tests/cmdline/tree_conflict_tests.py URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/tree_conflict_tests.py?rev=1302499&r1=1302498&r2=1302499&view=diff ============================================================================== --- subversion/trunk/subversion/tests/cmdline/tree_conflict_tests.py (original) +++ subversion/trunk/subversion/tests/cmdline/tree_conflict_tests.py Mon Mar 19 15:06:20 2012 @@ -1216,7 +1216,7 @@ def actual_only_node_behaviour(sbox): "export", foo_path, sbox.get_tempname()) # import expected_stdout = None - expected_stderr = ".*foo.*does not exist.*" + expected_stderr = ".*(foo.*does not exist|Can't stat.*foo).*" run_and_verify_svn(None, expected_stdout, expected_stderr, "import", '-m', svntest.main.make_log_msg(), foo_path, sbox.repo_url + '/foo_imported')