tests/failfilemerge.py

tests: skip a detailed exit status in test-lfs-test-server

The mode of failure here differs between `lfs-test-server` and `hg serve`, and
they each throw a different exception.  The `hg serve` case raises a subclass of
`StorageError`, which gets a detailed status.  The `lfs-test-server` case raises
a subclass of `Abort`, which does not.  Since the exit code isn't currently
conditionizable in the tests, this is the simplest way to avoid the failure.

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

# 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)