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.0 KiB
Python
88 lines
2.0 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 % "hg init"
|
|
sh % "touch a"
|
|
sh % "hg add a"
|
|
sh % "hg ci -m a"
|
|
|
|
sh % "echo 123" > "b"
|
|
sh % "hg add b"
|
|
sh % "hg diff --nodates" == r"""
|
|
diff -r 3903775176ed b
|
|
--- /dev/null
|
|
+++ b/b
|
|
@@ -0,0 +1,1 @@
|
|
+123"""
|
|
|
|
sh % "hg diff --nodates -r tip" == r"""
|
|
diff -r 3903775176ed b
|
|
--- /dev/null
|
|
+++ b/b
|
|
@@ -0,0 +1,1 @@
|
|
+123"""
|
|
|
|
sh % "echo foo" > "a"
|
|
sh % "hg diff --nodates" == r"""
|
|
diff -r 3903775176ed a
|
|
--- a/a
|
|
+++ b/a
|
|
@@ -0,0 +1,1 @@
|
|
+foo
|
|
diff -r 3903775176ed b
|
|
--- /dev/null
|
|
+++ b/b
|
|
@@ -0,0 +1,1 @@
|
|
+123"""
|
|
|
|
sh % "hg diff -r ''" == r"""
|
|
hg: parse error: empty query
|
|
[255]"""
|
|
sh % "hg diff -r tip -r ''" == r"""
|
|
hg: parse error: empty query
|
|
[255]"""
|
|
|
|
# Remove a file that was added via merge. Since the file is not in parent 1,
|
|
# it should not be in the diff.
|
|
|
|
sh % "hg ci -m 'a=foo' a"
|
|
sh % "hg co -Cq null"
|
|
sh % "echo 123" > "b"
|
|
sh % "hg add b"
|
|
sh % "hg ci -m b"
|
|
sh % "hg merge 1" == r"""
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
(branch merge, don't forget to commit)"""
|
|
sh % "hg rm -f a"
|
|
sh % "hg diff --nodates"
|
|
|
|
# Rename a file that was added via merge. Since the rename source is not in
|
|
# parent 1, the diff should be relative to /dev/null
|
|
|
|
sh % "hg co -Cq 2"
|
|
sh % "hg merge 1" == r"""
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
(branch merge, don't forget to commit)"""
|
|
sh % "hg mv a a2"
|
|
sh % "hg diff --nodates" == r"""
|
|
diff -r cf44b38435e5 a2
|
|
--- /dev/null
|
|
+++ b/a2
|
|
@@ -0,0 +1,1 @@
|
|
+foo"""
|
|
sh % "hg diff --nodates --git" == r"""
|
|
diff --git a/a2 b/a2
|
|
new file mode 100644
|
|
--- /dev/null
|
|
+++ b/a2
|
|
@@ -0,0 +1,1 @@
|
|
+foo"""
|