tests: fix the flaky test test-logtoprocess.t The main change is that we're waiting for the [touched] file to appear for 5 seconds instead of 0.1 seconds. Also, instead of implementing wait-on-file from scratch, we use the existing one from testlib/ that works well.

     1

# extension to emulate interrupting filemerge._filemerge

     2

     3

     4

from mercurial import (

     5

    error,

     6

    extensions,

     7

    filemerge,

     8

)

     9

    10

    11

def failfilemerge(*args, **kwargs):

    12

    raise error.Abort(b"^C")

    13

    14

    15

def extsetup(ui):

    16

    extensions.wrapfunction(filemerge, 'filemerge', failfilemerge)