Mercurial > hg
view contrib/benchmarks/perf.py @ 31174:842489d18118
tests: fix test-update-branches to remove non-conflicting file
I was clearly very sloppy when I wrote the test case for
experimental.updatecheck=noconflict. The test case that checks that
one can move between commits with a removed file was deleting a file
that was modified between the source and target commits, which
resulted in a "change/delete" conflict. Since that is a conlict, the
update correctly failed. Let's fix the test by removing a file that is
not modified between the two commits.
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Mon, 06 Mar 2017 23:19:57 -0800 |
parents | cff0f5926797 |
children | 2372284d9457 |
line wrap: on
line source
# perf.py - asv benchmarks using contrib/perf.py extension # # Copyright 2016 Logilab SA <contact@logilab.fr> # # This software may be used and distributed according to the terms of the # GNU General Public License version 2 or any later version. from __future__ import absolute_import from . import perfbench @perfbench() def track_tags(perf): return perf("perftags") @perfbench() def track_status(perf): return perf("perfstatus", unknown=False) @perfbench(params=[('rev', ['1000', '10000', 'tip'])]) def track_manifest(perf, rev): return perf("perfmanifest", rev) @perfbench() def track_heads(perf): return perf("perfheads")