mirror of
https://github.com/facebook/sapling.git
synced 2024-10-10 16:57:49 +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
78 lines
1.9 KiB
Python
78 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 % "hg init test"
|
|
sh % "cd test"
|
|
sh % "echo a" > "changed"
|
|
sh % "echo a" > "removed"
|
|
sh % "echo a" > "source"
|
|
sh % "hg ci -Am addfiles" == r"""
|
|
adding changed
|
|
adding removed
|
|
adding source"""
|
|
sh % "echo a" >> "changed"
|
|
sh % "echo a" > "added"
|
|
sh % "hg add added"
|
|
sh % "hg rm removed"
|
|
sh % "hg cp source copied"
|
|
sh % "hg diff --git" > "../unknown.diff"
|
|
|
|
# Test adding on top of an unknown file
|
|
|
|
sh % "hg up -qC 0"
|
|
sh % "hg purge"
|
|
sh % "echo a" > "added"
|
|
sh % "hg import --no-commit ../unknown.diff" == r"""
|
|
applying ../unknown.diff
|
|
file added already exists
|
|
1 out of 1 hunks FAILED -- saving rejects to file added.rej
|
|
abort: patch failed to apply
|
|
[255]"""
|
|
|
|
# Test modifying an unknown file
|
|
|
|
sh % "hg revert -aq"
|
|
sh % "hg purge"
|
|
sh % "hg rm changed"
|
|
sh % "hg ci -m removechanged"
|
|
sh % "echo a" > "changed"
|
|
sh % "hg import --no-commit ../unknown.diff" == r"""
|
|
applying ../unknown.diff
|
|
abort: cannot patch changed: file is not tracked
|
|
[255]"""
|
|
|
|
# Test removing an unknown file
|
|
|
|
sh % "hg up -qC 0"
|
|
sh % "hg purge"
|
|
sh % "hg rm removed"
|
|
sh % "hg ci -m removeremoved"
|
|
sh % "echo a" > "removed"
|
|
sh % "hg import --no-commit ../unknown.diff" == r"""
|
|
applying ../unknown.diff
|
|
abort: cannot patch removed: file is not tracked
|
|
[255]"""
|
|
|
|
# Test copying onto an unknown file
|
|
|
|
sh % "hg up -qC 0"
|
|
sh % "hg purge"
|
|
sh % "echo a" > "copied"
|
|
sh % "hg import --no-commit ../unknown.diff" == r"""
|
|
applying ../unknown.diff
|
|
abort: cannot create copied: destination already exists
|
|
[255]"""
|
|
|
|
sh % "cd .."
|