D3834: py3: add b'' prefixes in tests/test-bundle2-pushback.t

pulkit (Pulkit Goyal) phabricator at mercurial-scm.org
Mon Jun 25 20:45:12 UTC 2018


pulkit created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.

REVISION SUMMARY
  This makes the test run on Python 3.
  
  1. skip-blame because just b'' prefixes.

REPOSITORY
  rHG Mercurial

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

AFFECTED FILES
  contrib/python3-whitelist
  tests/test-bundle2-pushback.t

CHANGE DETAILS

diff --git a/tests/test-bundle2-pushback.t b/tests/test-bundle2-pushback.t
--- a/tests/test-bundle2-pushback.t
+++ b/tests/test-bundle2-pushback.t
@@ -20,18 +20,18 @@
   >     It issues an additional pushkey part to send a new
   >     bookmark back to the client"""
   >     result = bundle2.handlechangegroup(op, inpart)
-  >     if 'pushback' in op.reply.capabilities:
-  >         params = {'namespace': 'bookmarks',
-  >                   'key': 'new-server-mark',
-  >                   'old': '',
-  >                   'new': 'tip'}
+  >     if b'pushback' in op.reply.capabilities:
+  >         params = {b'namespace': b'bookmarks',
+  >                   b'key': b'new-server-mark',
+  >                   b'old': b'',
+  >                   b'new': b'tip'}
   >         encodedparams = [(k, pushkey.encode(v)) for (k,v) in params.items()]
-  >         op.reply.newpart('pushkey', mandatoryparams=encodedparams)
+  >         op.reply.newpart(b'pushkey', mandatoryparams=encodedparams)
   >     else:
-  >         op.reply.newpart('output', data='pushback not enabled')
+  >         op.reply.newpart(b'output', data=b'pushback not enabled')
   >     return result
   > _newhandlechangegroup.params = bundle2.handlechangegroup.params
-  > bundle2.parthandlermapping['changegroup'] = _newhandlechangegroup
+  > bundle2.parthandlermapping[b'changegroup'] = _newhandlechangegroup
   > EOF
 
   $ cat >> $HGRCPATH <<EOF
diff --git a/contrib/python3-whitelist b/contrib/python3-whitelist
--- a/contrib/python3-whitelist
+++ b/contrib/python3-whitelist
@@ -33,6 +33,7 @@
 test-bundle-type.t
 test-bundle-vs-outgoing.t
 test-bundle2-multiple-changegroups.t
+test-bundle2-pushback.t
 test-cappedreader.py
 test-casecollision.t
 test-cat.t



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


More information about the Mercurial-devel mailing list