mirror of
https://github.com/facebook/sapling.git
synced 2024-10-06 14:58:03 +03:00
92f6f35e7a
Summary: This diff marks **ALL** mercurial tests requiring Python 2 feature. After you fixes some tests, simply remove the `py2` feature requirement and that tests will be continuously run after your diff is landed. To bypass this feature requirement, run the tests command with `HGTEST_FORCE_PY2=1`. For example: ``` HGTEST_FORCE_PY2=1 buck test //eden/scm/tests:hg_run_tests ``` or ``` HGTEST_FORCE_PY2=1 python run-tests.py ``` ---- Basically this diff are created with the following commands: ``` $ sed -i 's/import feature\(.*\)$/import feature\1\n\nfeature.require(["py2"])/' test-*-t.py $ sed -i '1s/^/#require py2\n/' test-*.t $ ls | grep -P "^test.*(?<\!-t)\.py$" > list && vim -p $(cat list) # manually adding feature requires for these Python tests. ``` (Note: this ignores all push blocking failures!) ignore-conflict-markers Reviewed By: singhsrb Differential Revision: D19655148 fbshipit-source-id: 985e3ccb4010cc559049f1d89f8909bc2d9b5e20
79 lines
1.3 KiB
Python
79 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
|
|
|
|
|
|
feature.require(["py2"])
|
|
|
|
|
|
sh % "hg init"
|
|
|
|
sh % "cat" << r"""
|
|
a
|
|
b
|
|
c
|
|
""" > "a"
|
|
sh % "hg ci -Am adda" == "adding a"
|
|
|
|
sh % "cat" << r"""
|
|
d
|
|
e
|
|
f
|
|
""" > "a"
|
|
sh % "hg ci -m moda"
|
|
|
|
sh % "hg diff --reverse -r0 -r1" == r"""
|
|
diff -r 2855cdcfcbb7 -r 8e1805a3cf6e a
|
|
--- a/a Thu Jan 01 00:00:00 1970 +0000
|
|
+++ b/a Thu Jan 01 00:00:00 1970 +0000
|
|
@@ -1,3 +1,3 @@
|
|
-d
|
|
-e
|
|
-f
|
|
+a
|
|
+b
|
|
+c"""
|
|
|
|
sh % "cat" << r"""
|
|
g
|
|
h
|
|
""" >> "a"
|
|
sh % "hg diff --reverse --nodates" == r"""
|
|
diff -r 2855cdcfcbb7 a
|
|
--- a/a
|
|
+++ b/a
|
|
@@ -1,5 +1,3 @@
|
|
d
|
|
e
|
|
f
|
|
-g
|
|
-h"""
|
|
|
|
# should show removed file 'a' as being added
|
|
sh % "hg revert a"
|
|
sh % "hg rm a"
|
|
sh % "hg diff --reverse --nodates a" == r"""
|
|
diff -r 2855cdcfcbb7 a
|
|
--- /dev/null
|
|
+++ b/a
|
|
@@ -0,0 +1,3 @@
|
|
+d
|
|
+e
|
|
+f"""
|
|
|
|
# should show added file 'b' as being removed
|
|
sh % "echo b" >> "b"
|
|
sh % "hg add b"
|
|
sh % "hg diff --reverse --nodates b" == r"""
|
|
diff -r 2855cdcfcbb7 b
|
|
--- a/b
|
|
+++ /dev/null
|
|
@@ -1,1 +0,0 @@
|
|
-b"""
|