##// END OF EJS Templates
patch: don't separate \r and \n when colorizing diff output...
patch: don't separate \r and \n when colorizing diff output When displaying diffs, \r at the end of a line is treated as trailing whitespace. This causes an ANSI escape code to be inserted between \r and \n. Some programs, such as less since version 530 (maybe earlier, but at least not version 487) displays ^M when it encounters a lone \r. This causes a lot of noise in diff output on Windows, where \r\n is used to terminate lines. We avoid that by treating both \n and \r\n as end of line when considering trailing whitespace.

File last commit:

r37803:b4d85bc1 default
r38649:e1987261 default
Show More
test-sshserver.py
53 lines | 1.5 KiB | text/x-python | PythonLexer
/ tests / test-sshserver.py
Siddharth Agarwal
sshserver: add a couple of tests for argument parsing...
r35770 from __future__ import absolute_import, print_function
import io
import unittest
import silenttestrunner
from mercurial import (
Gregory Szorc
wireprotoserver: move sshserver into module (API)...
r35877 wireprotoserver,
Gregory Szorc
wireproto: rename wireproto to wireprotov1server (API)...
r37803 wireprotov1server,
Siddharth Agarwal
sshserver: add a couple of tests for argument parsing...
r35770 )
Yuya Nishihara
procutil: bulk-replace function calls to point to new module
r37138 from mercurial.utils import (
procutil,
)
Siddharth Agarwal
sshserver: add a couple of tests for argument parsing...
r35770 class SSHServerGetArgsTests(unittest.TestCase):
def testparseknown(self):
tests = [
Gregory Szorc
py3: add b'' to test-sshserver.py...
r36230 (b'* 0\nnodes 0\n', [b'', {}]),
(b'* 0\nnodes 40\n1111111111111111111111111111111111111111\n',
[b'1111111111111111111111111111111111111111', {}]),
Siddharth Agarwal
sshserver: add a couple of tests for argument parsing...
r35770 ]
for input, expected in tests:
Gregory Szorc
py3: add b'' to test-sshserver.py...
r36230 self.assertparse(b'known', input, expected)
Siddharth Agarwal
sshserver: add a couple of tests for argument parsing...
r35770
def assertparse(self, cmd, input, expected):
server = mockserver(input)
Gregory Szorc
wireprotoserver: move SSH server operation to a standalone function...
r36232 proto = wireprotoserver.sshv1protocolhandler(server._ui,
server._fin,
server._fout)
Gregory Szorc
wireproto: rename wireproto to wireprotov1server (API)...
r37803 _func, spec = wireprotov1server.commands[cmd]
Gregory Szorc
wireprotoserver: move SSH server operation to a standalone function...
r36232 self.assertEqual(proto.getargs(spec), expected)
Siddharth Agarwal
sshserver: add a couple of tests for argument parsing...
r35770
def mockserver(inbytes):
ui = mockui(inbytes)
repo = mockrepo(ui)
Gregory Szorc
wireprotoserver: move sshserver into module (API)...
r35877 return wireprotoserver.sshserver(ui, repo)
Siddharth Agarwal
sshserver: add a couple of tests for argument parsing...
r35770
class mockrepo(object):
def __init__(self, ui):
self.ui = ui
class mockui(object):
def __init__(self, inbytes):
self.fin = io.BytesIO(inbytes)
self.fout = io.BytesIO()
self.ferr = io.BytesIO()
if __name__ == '__main__':
Matt Harbison
test-sshserver: stabilize for Windows
r35790 # Don't call into msvcrt to set BytesIO to binary mode
Yuya Nishihara
procutil: bulk-replace function calls to point to new module
r37138 procutil.setbinary = lambda fp: True
Siddharth Agarwal
sshserver: add a couple of tests for argument parsing...
r35770 silenttestrunner.main(__name__)