sapling/eden/scm/tests/test-merge-revert-t.py
Zeyi (Rice) Fan 92f6f35e7a mark all tests requiring Python 2
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
2020-01-30 18:49:21 -08:00

69 lines
1.9 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 % ". helpers-usechg.sh"
sh % "hg init"
sh % "echo 'added file1'" > "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:08a16e8e4408
0:d29c767a4b52"""
sh % "hg id" == "08a16e8e4408"
sh % "hg update -C 0" == "1 files updated, 0 files merged, 0 files removed, 0 files unresolved"
sh % "hg id" == "d29c767a4b52"
sh % "echo 'changed file1'" >> "file1"
sh % "hg id" == "d29c767a4b52+"
sh % "hg revert --all" == "reverting file1"
sh % "hg diff"
sh % "hg status" == "? file1.orig"
sh % "hg id" == "d29c767a4b52"
sh % "hg update" == "1 files updated, 0 files merged, 0 files removed, 0 files unresolved"
sh % "hg diff"
sh % "hg status" == "? file1.orig"
sh % "hg id" == "08a16e8e4408"
sh % "hg update -C 0" == "1 files updated, 0 files merged, 0 files removed, 0 files unresolved"
sh % "echo 'changed file1'" >> "file1"
sh % "hg update" == "1 files updated, 0 files merged, 0 files removed, 0 files unresolved"
sh % "hg diff"
sh % "hg status" == "? file1.orig"
sh % "hg id" == "08a16e8e4408"
sh % "hg revert --all"
sh % "hg diff"
sh % "hg status" == "? file1.orig"
sh % "hg id" == "08a16e8e4408"
sh % "hg revert -r tip --all"
sh % "hg diff"
sh % "hg status" == "? file1.orig"
sh % "hg id" == "08a16e8e4408"
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" == "08a16e8e4408"