view tests/failfilemerge.py @ 48314:6f43569729d4 stable

tests: accept alternative privileged port allocation failure

This registers an additional failure message on failed privileged port
allocation, equally funcionally valid but previously not handled and causing
the test to fail when run in the NixOS sandbox.

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

# extension to emulate interrupting filemerge._filemerge

from __future__ import absolute_import

from mercurial import (
    error,
    extensions,
    filemerge,
)


def failfilemerge(
    filemergefn, premerge, repo, wctx, mynode, orig, fcd, fco, fca, labels=None
):
    raise error.Abort(b"^C")
    return filemergefn(premerge, repo, mynode, orig, fcd, fco, fca, labels)


def extsetup(ui):
    extensions.wrapfunction(filemerge, '_filemerge', failfilemerge)