comparison tests/test-wireproto.py @ 36944:65615c29e74f

tests: fix test-wireproto.py to work around serverrepo() not having a ui This started failing recently, but it doesn't look important as no actual ui objects have been in play. Differential Revision: https://phab.mercurial-scm.org/D2867
author Augie Fackler <augie@google.com>
date Wed, 14 Mar 2018 15:56:34 -0400
parents 66de4555cefd
children 45b39c69fae0
comparison
equal deleted inserted replaced
36943:c8768bc46d24 36944:65615c29e74f
1 from __future__ import absolute_import, print_function 1 from __future__ import absolute_import, print_function
2 2
3 from mercurial import ( 3 from mercurial import (
4 error, 4 error,
5 pycompat, 5 pycompat,
6 ui as uimod,
6 util, 7 util,
7 wireproto, 8 wireproto,
8 wireprototypes, 9 wireprototypes,
9 ) 10 )
10 stringio = util.stringio 11 stringio = util.stringio
20 21
21 def checkperm(self, perm): 22 def checkperm(self, perm):
22 pass 23 pass
23 24
24 class clientpeer(wireproto.wirepeer): 25 class clientpeer(wireproto.wirepeer):
25 def __init__(self, serverrepo): 26 def __init__(self, serverrepo, ui):
26 self.serverrepo = serverrepo 27 self.serverrepo = serverrepo
28 self._ui = ui
27 29
28 @property 30 @property
29 def ui(self): 31 def ui(self):
30 return self.serverrepo.ui 32 return self._ui
31 33
32 def url(self): 34 def url(self):
33 return b'test' 35 return b'test'
34 36
35 def local(self): 37 def local(self):
82 return mangle(repo.greet(unmangle(name))) 84 return mangle(repo.greet(unmangle(name)))
83 85
84 wireproto.commands[b'greet'] = (greet, b'name',) 86 wireproto.commands[b'greet'] = (greet, b'name',)
85 87
86 srv = serverrepo() 88 srv = serverrepo()
87 clt = clientpeer(srv) 89 clt = clientpeer(srv, uimod.ui())
88 90
89 print(clt.greet(b"Foobar")) 91 print(clt.greet(b"Foobar"))
90 b = clt.iterbatch() 92 b = clt.iterbatch()
91 list(map(b.greet, (b'Fo, =;:<o', b'Bar'))) 93 list(map(b.greet, (b'Fo, =;:<o', b'Bar')))
92 b.submit() 94 b.submit()