comparison tests/sshprotoext.py @ 35937:a9cffd14aa04

sshpeer: inline I/O into _validaterepo()

We want to move the handshake code out of the peer class so the
peer factory function can perform the handshake and instantiate
a proper class depending on the results. To make that refactor
easier to read, we first inline I/O functionality into
_validaterepo().

Test output for low-level protocol tests didn't change, thus
hopefully demonstrating that this refactor didn't change any
material behavior.

Because we no longer call _callstream(), our test extension for
monkeypatching the peer had to change its hook point.

Differential Revision: https://phab.mercurial-scm.org/D2033

35936:f8f034344b39

        super(prehelloserver, self).serve_forever()

class extrahandshakecommandspeer(sshpeer.sshpeer):
    """An ssh peer that sends extra commands as part of initial handshake."""
    # There isn't a good hook point. So we wrap _callstream() and inject
    # logic when the peer says "hello".
    def _callstream(self, cmd, **args):
        if cmd != b'hello':
            return super(extrahandshakecommandspeer, self)._callstream(cmd,
                                                                       **args)

        mode = self._ui.config(b'sshpeer', b'handshake-mode')
        if mode == b'pre-no-args':
            self._callstream(b'no-args')
            return super(extrahandshakecommandspeer, self)._callstream(
                cmd, **args)
        elif mode == b'pre-multiple-no-args':
            self._callstream(b'unknown1')
            self._callstream(b'unknown2')
            self._callstream(b'unknown3')
            return super(extrahandshakecommandspeer, self)._callstream(
                cmd, **args)
        else:
            raise error.ProgrammingError(b'unknown HANDSHAKECOMMANDMODE: %s' %
                                         mode)

def registercommands():

35937:a9cffd14aa04

        super(prehelloserver, self).serve_forever()

class extrahandshakecommandspeer(sshpeer.sshpeer):
    """An ssh peer that sends extra commands as part of initial handshake."""
    def _validaterepo(self):
        mode = self._ui.config(b'sshpeer', b'handshake-mode')
        if mode == b'pre-no-args':
            self._callstream(b'no-args')
            return super(extrahandshakecommandspeer, self)._validaterepo()
        elif mode == b'pre-multiple-no-args':
            self._callstream(b'unknown1')
            self._callstream(b'unknown2')
            self._callstream(b'unknown3')
            return super(extrahandshakecommandspeer, self)._validaterepo()
        else:
            raise error.ProgrammingError(b'unknown HANDSHAKECOMMANDMODE: %s' %
                                         mode)

def registercommands():