This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3510

tests: port test-wireproto.py to Python 3
ClosedPublic

Authored by durin42 on May 8 2018, 3:27 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG40381a88bab4: tests: port test-wireproto.py to Python 3
Summary

A little bit of output churn because we now get b'' prefixes on output
in both 2 and 3, but for this test I'm more comfortable knowing that
we're using bytestrs everywhere.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

durin42 created this revision.May 8 2018, 3:27 PM
pulkit accepted this revision.May 9 2018, 6:46 PM
Closed by commit rHG40381a88bab4: tests: port test-wireproto.py to Python 3 (authored by durin42). · Explain WhyMay 10 2018, 6:42 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 8604

contrib/python3-whitelist

test-username-newline.t test-username-newline.t
test-verify.t test-verify.t
test-walkrepo.py test-walkrepo.py
test-websub.t test-websub.t
test-win32text.t test-win32text.t
test-wireproto-clientreactor.py test-wireproto-clientreactor.py
test-wireproto-framing.py test-wireproto-framing.py
test-wireproto-serverreactor.py test-wireproto-serverreactor.py
test-wireproto.py
test-wsgirequest.py test-wsgirequest.py
test-xdg.t test-xdg.t

tests/test-wireproto.py

from __future__ import absolute_import, print_function from __future__ import absolute_import, print_function
import sys
from mercurial import ( from mercurial import (
error, error,
pycompat, pycompat,
ui as uimod, ui as uimod,
util, util,
wireprototypes, wireprototypes,
wireprotov1peer, wireprotov1peer,
wireprotov1server, wireprotov1server,
) )
from mercurial.utils import (
stringutil,
)
stringio = util.stringio stringio = util.stringio
class proto(object): class proto(object):
def __init__(self, args): def __init__(self, args):
self.args = args self.args = args
self.name = 'dummyproto' self.name = 'dummyproto'
def getargs(self, spec): def getargs(self, spec):
def greet(repo, proto, name): def greet(repo, proto, name):
return mangle(repo.greet(unmangle(name))) return mangle(repo.greet(unmangle(name)))
wireprotov1server.commands[b'greet'] = (greet, b'name') wireprotov1server.commands[b'greet'] = (greet, b'name')
srv = serverrepo() srv = serverrepo()
clt = clientpeer(srv, uimod.ui()) clt = clientpeer(srv, uimod.ui())
print(clt.greet(b"Foobar")) def printb(data, end=b'\n'):
out = getattr(sys.stdout, 'buffer', sys.stdout)
out.write(data + end)
out.flush()
printb(clt.greet(b"Foobar"))
with clt.commandexecutor() as e: with clt.commandexecutor() as e:
fgreet1 = e.callcommand(b'greet', {b'name': b'Fo, =;:<o'}) fgreet1 = e.callcommand(b'greet', {b'name': b'Fo, =;:<o'})
fgreet2 = e.callcommand(b'greet', {b'name': b'Bar'}) fgreet2 = e.callcommand(b'greet', {b'name': b'Bar'})
print([f.result() for f in (fgreet1, fgreet2)]) printb(stringutil.pprint([f.result() for f in (fgreet1, fgreet2)]))

tests/test-wireproto.py.out

Hello, Foobar Hello, Foobar
['Hello, Fo, =;:<o', 'Hello, Bar'] [b'Hello, Fo, =;:<o', b'Hello, Bar']