Mercurial > hg
view tests/mockblackbox.py @ 48278:fd3d4b7f8e62
tests: fix test-convert-git to work w/ "git pull" requiring strategy
A recent change to git (031e2f7ae195) made it an error to not specify a strategy
(`--rebase`, `--no-rebase`, `--ff-only`), instead of just the warning it was
previously. As far as I can tell, `--no-rebase` is the behavior we were getting
before, and the only one that makes the test work.
Differential Revision: https://phab.mercurial-scm.org/D11714
author | Kyle Lippincott <spectral@google.com> |
---|---|
date | Tue, 19 Oct 2021 18:06:07 -0700 |
parents | 2372284d9457 |
children | 6000f5b25c9b |
line wrap: on
line source
from __future__ import absolute_import from mercurial.utils import procutil # XXX: we should probably offer a devel option to do this in blackbox directly def getuser(): return b'bob' def getpid(): return 5000 # mock the date and user apis so the output is always the same def uisetup(ui): procutil.getuser = getuser procutil.getpid = getpid