Patchwork D3130: py3: suppress output from f.write() function class

login
register
mail settings
Submitter phabricator
Date April 5, 2018, 12:32 p.m.
Message ID <differential-rev-PHID-DREV-eclplrabbh6fmtvhdkyj-req@phab.mercurial-scm.org>
Download mbox | patch
Permalink /patch/30357/
State Superseded
Headers show

Comments

phabricator - April 5, 2018, 12:32 p.m.
pulkit created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.

REVISION SUMMARY
  We need to suppress them because the output is not present on Python 2

REPOSITORY
  rHG Mercurial

REVISION DETAIL
  https://phab.mercurial-scm.org/D3130

AFFECTED FILES
  tests/test-diff-unified.t

CHANGE DETAILS




To: pulkit, #hg-reviewers
Cc: mercurial-devel

Patch

diff --git a/tests/test-diff-unified.t b/tests/test-diff-unified.t
--- a/tests/test-diff-unified.t
+++ b/tests/test-diff-unified.t
@@ -394,33 +394,33 @@ 
   $ cd longfunc
 
   >>> with open('a', 'wb') as f:
-  ...     f.write(b'a' * 39 + b'bb' + b'\n')
-  ...     f.write(b' .\n' * 3)
-  ...     f.write(b' 0 b\n')
-  ...     f.write(b' .\n' * 3)
-  ...     f.write(b'a' * 39 + b'\xc3\xa0' + b'\n')
-  ...     f.write(b' .\n' * 3)
-  ...     f.write(b' 0 a with grave (single code point)\n')
-  ...     f.write(b' .\n' * 3)
-  ...     f.write(b'a' * 39 + b'a\xcc\x80' + b'\n')
-  ...     f.write(b' .\n' * 3)
-  ...     f.write(b' 0 a with grave (composition)\n')
-  ...     f.write(b' .\n' * 3)
+  ...     f.write(b'a' * 39 + b'bb' + b'\n') and None
+  ...     f.write(b' .\n' * 3) and None
+  ...     f.write(b' 0 b\n') and None
+  ...     f.write(b' .\n' * 3) and None
+  ...     f.write(b'a' * 39 + b'\xc3\xa0' + b'\n') and None
+  ...     f.write(b' .\n' * 3) and None
+  ...     f.write(b' 0 a with grave (single code point)\n') and None
+  ...     f.write(b' .\n' * 3) and None
+  ...     f.write(b'a' * 39 + b'a\xcc\x80' + b'\n') and None
+  ...     f.write(b' .\n' * 3) and None
+  ...     f.write(b' 0 a with grave (composition)\n') and None
+  ...     f.write(b' .\n' * 3) and None
   $ hg ci -qAm0
 
   >>> with open('a', 'wb') as f:
-  ...     f.write(b'a' * 39 + b'bb' + b'\n')
-  ...     f.write(b' .\n' * 3)
-  ...     f.write(b' 1 b\n')
-  ...     f.write(b' .\n' * 3)
-  ...     f.write(b'a' * 39 + b'\xc3\xa0' + b'\n')
-  ...     f.write(b' .\n' * 3)
-  ...     f.write(b' 1 a with grave (single code point)\n')
-  ...     f.write(b' .\n' * 3)
-  ...     f.write(b'a' * 39 + b'a\xcc\x80' + b'\n')
-  ...     f.write(b' .\n' * 3)
-  ...     f.write(b' 1 a with grave (composition)\n')
-  ...     f.write(b' .\n' * 3)
+  ...     f.write(b'a' * 39 + b'bb' + b'\n') and None
+  ...     f.write(b' .\n' * 3) and None
+  ...     f.write(b' 1 b\n') and None
+  ...     f.write(b' .\n' * 3) and None
+  ...     f.write(b'a' * 39 + b'\xc3\xa0' + b'\n') and None
+  ...     f.write(b' .\n' * 3) and None
+  ...     f.write(b' 1 a with grave (single code point)\n') and None
+  ...     f.write(b' .\n' * 3) and None
+  ...     f.write(b'a' * 39 + b'a\xcc\x80' + b'\n') and None
+  ...     f.write(b' .\n' * 3) and None
+  ...     f.write(b' 1 a with grave (composition)\n') and None
+  ...     f.write(b' .\n' * 3) and None
   $ hg ci -m1
 
   $ hg diff -c1 --nodates --show-function