mirror of
https://github.com/facebook/sapling.git
synced 2024-10-11 17:27:53 +03:00
0c36fd8b5e
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
88 lines
2.5 KiB
Python
88 lines
2.5 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 'added file1'" > "file1"
|
|
sh % "echo 'another line of text'" >> "file1"
|
|
sh % "echo 'added file2'" > "file2"
|
|
sh % "hg add file1 file2"
|
|
sh % "hg commit -m 'added file1 and file2'"
|
|
|
|
sh % "echo 'changed file1'" >> "file1"
|
|
sh % "hg commit -m 'changed file1'"
|
|
|
|
sh % "hg -q log" == r"""
|
|
1:dfab7f3c2efb
|
|
0:c3fa057dd86f"""
|
|
sh % "hg id" == "dfab7f3c2efb tip"
|
|
|
|
sh % "hg update -C 0" == "1 files updated, 0 files merged, 0 files removed, 0 files unresolved"
|
|
sh % "hg id" == "c3fa057dd86f"
|
|
|
|
sh % "echo 'changed file1'" >> "file1"
|
|
sh % "hg id" == "c3fa057dd86f+"
|
|
|
|
sh % "hg revert --no-backup --all" == "reverting file1"
|
|
sh % "hg diff"
|
|
sh % "hg status"
|
|
sh % "hg id" == "c3fa057dd86f"
|
|
|
|
sh % "hg update" == "1 files updated, 0 files merged, 0 files removed, 0 files unresolved"
|
|
sh % "hg diff"
|
|
sh % "hg status"
|
|
sh % "hg id" == "dfab7f3c2efb tip"
|
|
|
|
sh % "hg update -C 0" == "1 files updated, 0 files merged, 0 files removed, 0 files unresolved"
|
|
sh % "echo 'changed file1 different'" >> "file1"
|
|
|
|
sh % "hg update" == r"""
|
|
merging file1
|
|
warning: 1 conflicts while merging file1! (edit, then use 'hg resolve --mark')
|
|
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
|
|
use 'hg resolve' to retry unresolved file merges
|
|
[1]"""
|
|
|
|
sh % "hg diff --nodates" == r"""
|
|
diff -r dfab7f3c2efb file1
|
|
--- a/file1
|
|
+++ b/file1
|
|
@@ -1,3 +1,7 @@
|
|
added file1
|
|
another line of text
|
|
+<<<<<<< working copy: c3fa057dd86f - test: added file1 and file2
|
|
+changed file1 different
|
|
+=======
|
|
changed file1
|
|
+>>>>>>> destination: dfab7f3c2efb - test: changed file1"""
|
|
|
|
sh % "hg status" == r"""
|
|
M file1
|
|
? file1.orig"""
|
|
sh % "hg id" == "dfab7f3c2efb+ tip"
|
|
|
|
sh % "hg revert --no-backup --all" == "reverting file1"
|
|
sh % "hg diff"
|
|
sh % "hg status" == "? file1.orig"
|
|
sh % "hg id" == "dfab7f3c2efb tip"
|
|
|
|
sh % "hg revert -r tip --no-backup --all"
|
|
sh % "hg diff"
|
|
sh % "hg status" == "? file1.orig"
|
|
sh % "hg id" == "dfab7f3c2efb tip"
|
|
|
|
sh % "hg update -C" == "0 files updated, 0 files merged, 0 files removed, 0 files unresolved"
|
|
sh % "hg diff"
|
|
sh % "hg status" == "? file1.orig"
|
|
sh % "hg id" == "dfab7f3c2efb tip"
|