Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 0689B2007D0 for ; Tue, 10 May 2016 20:06:30 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 0450516098A; Tue, 10 May 2016 18:06:30 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 4B89B160877 for ; Tue, 10 May 2016 20:06:29 +0200 (CEST) Received: (qmail 31035 invoked by uid 500); 10 May 2016 18:06:28 -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 31025 invoked by uid 99); 10 May 2016 18:06:28 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd3-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 10 May 2016 18:06:28 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd3-us-west.apache.org (ASF Mail Server at spamd3-us-west.apache.org) with ESMTP id 20C4C18056C for ; Tue, 10 May 2016 18:06:28 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd3-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 0.999 X-Spam-Level: X-Spam-Status: No, score=0.999 tagged_above=-999 required=6.31 tests=[KAM_LAZY_DOMAIN_SECURITY=1, RP_MATCHES_RCVD=-0.001] autolearn=disabled Received: from mx1-lw-eu.apache.org ([10.40.0.8]) by localhost (spamd3-us-west.apache.org [10.40.0.10]) (amavisd-new, port 10024) with ESMTP id CbyJj4piqB3H for ; Tue, 10 May 2016 18:06:26 +0000 (UTC) Received: from mailrelay1-us-west.apache.org (mailrelay1-us-west.apache.org [209.188.14.139]) by mx1-lw-eu.apache.org (ASF Mail Server at mx1-lw-eu.apache.org) with ESMTP id 93A955F486 for ; Tue, 10 May 2016 18:06:25 +0000 (UTC) Received: from svn01-us-west.apache.org (svn.apache.org [10.41.0.6]) by mailrelay1-us-west.apache.org (ASF Mail Server at mailrelay1-us-west.apache.org) with ESMTP id 66D39E009C for ; Tue, 10 May 2016 18:06:24 +0000 (UTC) Received: from svn01-us-west.apache.org (localhost [127.0.0.1]) by svn01-us-west.apache.org (ASF Mail Server at svn01-us-west.apache.org) with ESMTP id 11A063A0216 for ; Tue, 10 May 2016 18:06:23 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1743244 - /subversion/trunk/subversion/tests/cmdline/trans_tests.py Date: Tue, 10 May 2016 18:06:23 -0000 To: commits@subversion.apache.org From: stefan2@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20160510180624.11A063A0216@svn01-us-west.apache.org> archived-at: Tue, 10 May 2016 18:06:30 -0000 Author: stefan2 Date: Tue May 10 18:06:23 2016 New Revision: 1743244 URL: http://svn.apache.org/viewvc?rev=1743244&view=rev Log: Get trans tests to work with Python 3. * subversion/tests/cmdline/trans_tests.py (eol_change_is_text_mod): Binary files require us to write byte strings to them. Modified: subversion/trunk/subversion/tests/cmdline/trans_tests.py Modified: subversion/trunk/subversion/tests/cmdline/trans_tests.py URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/trans_tests.py?rev=1743244&r1=1743243&r2=1743244&view=diff ============================================================================== --- subversion/trunk/subversion/tests/cmdline/trans_tests.py (original) +++ subversion/trunk/subversion/tests/cmdline/trans_tests.py Tue May 10 18:06:23 2016 @@ -562,9 +562,9 @@ def eol_change_is_text_mod(sbox): foo_path = os.path.join(wc_dir, 'foo') f = open(foo_path, 'wb') if svntest.main.windows: - f.write("1\r\n2\r\n3\r\n4\r\n5\r\n6\r\n7\r\n8\r\n9\r\n") + f.write(b"1\r\n2\r\n3\r\n4\r\n5\r\n6\r\n7\r\n8\r\n9\r\n") else: - f.write("1\n2\n3\n4\n5\n6\n7\n8\n9\n") + f.write(b"1\n2\n3\n4\n5\n6\n7\n8\n9\n") f.close() # commit the file @@ -591,10 +591,10 @@ def eol_change_is_text_mod(sbox): # check 2: do the files have the right contents now? contents = open(foo_path, 'rb').read() if svntest.main.windows: - if contents != "1\n2\n3\n4\n5\n6\n7\n8\n9\n": + if contents != b"1\n2\n3\n4\n5\n6\n7\n8\n9\n": raise svntest.Failure else: - if contents != "1\r\n2\r\n3\r\n4\r\n5\r\n6\r\n7\r\n8\r\n9\r\n": + if contents != b"1\r\n2\r\n3\r\n4\r\n5\r\n6\r\n7\r\n8\r\n9\r\n": raise svntest.Failure foo_base_path = svntest.wc.text_base_path(foo_path)