[PATCH 1 of 5] py3: silence f.write() in test-annotate.t

Yuya Nishihara yuya at tcha.org
Sat Mar 10 08:11:11 UTC 2018


# HG changeset patch
# User Yuya Nishihara <yuya at tcha.org>
# Date 1520668554 -32400
#      Sat Mar 10 16:55:54 2018 +0900
# Node ID 7742cc1155b78a819ee1ecce7783c36bec42548e
# Parent  a20a3f5171d4eacc6a2f801f0ce39516fb9fd444
py3: silence f.write() in test-annotate.t

diff --git a/tests/test-annotate.t b/tests/test-annotate.t
--- a/tests/test-annotate.t
+++ b/tests/test-annotate.t
@@ -914,10 +914,10 @@ Annotate with orphaned CR (issue5798)
   > EOF
 
   >>> with open('a', 'wb') as f:
-  ...     f.write(b'0a\r0b\r\n0c\r0d\r\n0e\n0f\n0g')
+  ...     f.write(b'0a\r0b\r\n0c\r0d\r\n0e\n0f\n0g') and None
   $ hg ci -qAm0
   >>> with open('a', 'wb') as f:
-  ...     f.write(b'0a\r0b\r\n1c\r1d\r\n0e\n1f\n0g')
+  ...     f.write(b'0a\r0b\r\n1c\r1d\r\n0e\n1f\n0g') and None
   $ hg ci -m1
 
   $ hg annotate -r0 a | $PYTHON "$TESTTMP/substcr.py"


More information about the Mercurial-devel mailing list