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

login
register
mail settings
Submitter Yuya Nishihara
Date March 10, 2018, 8:11 a.m.
Message ID <7742cc1155b78a819ee1.1520669471@mimosa>
Download mbox | patch
Permalink /patch/29242/
State Accepted
Headers show

Comments

Yuya Nishihara - March 10, 2018, 8:11 a.m.
# HG changeset patch
# User Yuya Nishihara <yuya@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
Pulkit Goyal - March 10, 2018, 8:37 a.m.
Queued the series. Many thanks!

On Sat, Mar 10, 2018 at 1:41 PM, Yuya Nishihara <yuya@tcha.org> wrote:
> # HG changeset patch
> # User Yuya Nishihara <yuya@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"
> _______________________________________________
> Mercurial-devel mailing list
> Mercurial-devel@mercurial-scm.org
> https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

Patch

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"