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
61 lines
1.5 KiB
Python
61 lines
1.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
|
|
|
|
|
|
feature.require(["py2"])
|
|
|
|
|
|
sh % "hg init a"
|
|
sh % "cd a"
|
|
|
|
sh % "hg diff inexistent1 inexistent2" == r"""
|
|
inexistent1: * (glob)
|
|
inexistent2: * (glob)"""
|
|
|
|
sh % "echo bar" > "foo"
|
|
sh % "hg add foo"
|
|
sh % "hg ci -m 'add foo'"
|
|
|
|
sh % "echo foobar" > "foo"
|
|
sh % "hg ci -m 'change foo'"
|
|
|
|
sh % "hg --quiet diff -r 0 -r 1" == r"""
|
|
--- a/foo Thu Jan 01 00:00:00 1970 +0000
|
|
+++ b/foo Thu Jan 01 00:00:00 1970 +0000
|
|
@@ -1,1 +1,1 @@
|
|
-bar
|
|
+foobar"""
|
|
|
|
sh % "hg diff -r 0 -r 1" == r"""
|
|
diff -r a99fb63adac3 -r 9b8568d3af2f foo
|
|
--- a/foo Thu Jan 01 00:00:00 1970 +0000
|
|
+++ b/foo Thu Jan 01 00:00:00 1970 +0000
|
|
@@ -1,1 +1,1 @@
|
|
-bar
|
|
+foobar"""
|
|
|
|
sh % "hg --verbose diff -r 0 -r 1" == r"""
|
|
diff -r a99fb63adac3 -r 9b8568d3af2f foo
|
|
--- a/foo Thu Jan 01 00:00:00 1970 +0000
|
|
+++ b/foo Thu Jan 01 00:00:00 1970 +0000
|
|
@@ -1,1 +1,1 @@
|
|
-bar
|
|
+foobar"""
|
|
|
|
sh % "hg --debug diff -r 0 -r 1" == r"""
|
|
diff -r a99fb63adac3f31816a22f665bc3b7a7655b30f4 -r 9b8568d3af2f1749445eef03aede868a6f39f210 foo
|
|
--- a/foo Thu Jan 01 00:00:00 1970 +0000
|
|
+++ b/foo Thu Jan 01 00:00:00 1970 +0000
|
|
@@ -1,1 +1,1 @@
|
|
-bar
|
|
+foobar"""
|
|
|
|
sh % "cd .."
|