sapling/tests/test-merge5-t.py
Jun Wu 0c36fd8b5e tests: translate some .t tests to Python
Summary:
Those tests were converted using:

  echo *.t | xargs -P20 -n1 python -m testutil.dott.translate --black --verify

They run 5x faster (via run-tests.py), and 10x faster (via python directly).

run-tests.py on old .t files, 652 CPU seconds:

  % time ./run-tests.py `cat list-t.txt`  --noprogress
  .................................................................................................................................
  # Ran 129 tests, 0 skipped, 0 failed.
  ./run-tests.py `cat list-t.txt` --noprogress  505.30s user 146.37s system 1451% cpu 44.899 total

run-tests.py on new py tests, 135 CPU seconds:

  % time ./run-tests.py `cat list-py.txt` --noprogress
  .............................................................................................................................
  # Ran 125 tests, 0 skipped, 0 failed.
  ./run-tests.py `cat list-py.txt` --noprogress  55.73s user 78.80s system 744% cpu 18.061 total

vanilla python on new tests, 59 CPU seconds:

  % time (for i in `cat list-py.txt`; do python $i; done;)
  ( for i in `cat list-py.txt`; do; python $i; done; )  41.61s user 17.47s system 90% cpu 1:05.31 total

The new tests also have auto fix ability. `python test-foo-t.py --fix` will
autofix the code.

Reviewed By: xavierd

Differential Revision: D16172902

fbshipit-source-id: dda53990a7dfff5ac214c1237e4206a4d67e8e48
2019-07-17 21:11:32 -07:00

44 lines
1.3 KiB
Python

# Copyright (c) Facebook, Inc. and its affiliates.
# Copyright (c) Mercurial Contributors.
#
# 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 testutil.dott import feature, sh, testtmp # noqa: F401
sh % ". helpers-usechg.sh"
sh % "hg init"
sh % "echo This is file a1" > "a"
sh % "echo This is file b1" > "b"
sh % "hg add a b"
sh % "hg commit -m 'commit #0'"
sh % "echo This is file b22" > "b"
sh % "hg commit -m 'comment #1'"
sh % "hg update 0" == "1 files updated, 0 files merged, 0 files removed, 0 files unresolved"
sh % "rm b"
sh % "hg commit -A -m 'comment #2'" == "removing b"
sh % "hg update 1" == "1 files updated, 0 files merged, 0 files removed, 0 files unresolved"
sh % "rm b"
sh % "hg update -c 2" == r"""
abort: uncommitted changes
[255]"""
sh % "hg revert b"
sh % "hg update -c 2" == "0 files updated, 0 files merged, 1 files removed, 0 files unresolved"
sh % "mv a c"
# Should abort:
sh % "hg update 1" == r"""
abort: uncommitted changes
(commit or update --clean to discard changes)
[255]"""
sh % "mv c a"
# Should succeed:
sh % "hg update 1" == "1 files updated, 0 files merged, 0 files removed, 0 files unresolved"