forked from mirrors/gecko-dev
02a7b4ebdf
Allow-list all Python code in tree for use with the black linter, and re-format all code in-tree accordingly. To produce this patch I did all of the following: 1. Make changes to tools/lint/black.yml to remove include: stanza and update list of source extensions. 2. Run ./mach lint --linter black --fix 3. Make some ad-hoc manual updates to python/mozbuild/mozbuild/test/configure/test_configure.py -- it has some hard-coded line numbers that the reformat breaks. 4. Make some ad-hoc manual updates to `testing/marionette/client/setup.py`, `testing/marionette/harness/setup.py`, and `testing/firefox-ui/harness/setup.py`, which have hard-coded regexes that break after the reformat. 5. Add a set of exclusions to black.yml. These will be deleted in a follow-up bug (1672023). # ignore-this-changeset Differential Revision: https://phabricator.services.mozilla.com/D94045
74 lines
1.9 KiB
Python
74 lines
1.9 KiB
Python
# This Source Code Form is subject to the terms of the Mozilla Public
|
|
# License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
|
|
|
from __future__ import absolute_import
|
|
|
|
import mozunit
|
|
|
|
from mozversioncontrol import get_repository_object
|
|
|
|
STEPS = {
|
|
"hg": [
|
|
"""
|
|
echo "bar" >> bar
|
|
echo "baz" > foo
|
|
""",
|
|
],
|
|
"git": [
|
|
"""
|
|
echo "bar" >> bar
|
|
echo "baz" > foo
|
|
""",
|
|
],
|
|
}
|
|
|
|
|
|
def test_commit(repo):
|
|
vcs = get_repository_object(repo.strpath)
|
|
assert vcs.working_directory_clean()
|
|
|
|
# Modify both foo and bar
|
|
next(repo.step)
|
|
assert not vcs.working_directory_clean()
|
|
|
|
# Commit just bar
|
|
vcs.commit(
|
|
"Modify bar\n\nbut not baz",
|
|
"Testing McTesterson <test@example.org>",
|
|
"2017-07-14 02:40:00 UTC",
|
|
["bar"],
|
|
)
|
|
|
|
# We only committed bar, so foo is still keeping the working dir dirty
|
|
assert not vcs.working_directory_clean()
|
|
|
|
if repo.vcs == "git":
|
|
log_cmd = ["log", "-1", "--format=%an,%ae,%at,%B"]
|
|
patch_cmd = ["log", "-1", "-p"]
|
|
else:
|
|
log_cmd = [
|
|
"log",
|
|
"-l",
|
|
"1",
|
|
"-T",
|
|
'{person(author)},{email(author)},{date(localdate(date),"%s")},{desc}',
|
|
]
|
|
patch_cmd = ["log", "-l", "1", "-p"]
|
|
|
|
# Verify commit metadata (we rstrip to normalize trivial git/hg differences)
|
|
log = vcs._run(*log_cmd).rstrip()
|
|
assert (
|
|
log
|
|
== "Testing McTesterson,test@example.org,1500000000,Modify bar\n\nbut not baz"
|
|
)
|
|
|
|
# Verify only the intended file was added to the commit
|
|
patch = vcs._run(*patch_cmd)
|
|
diffs = [line for line in patch.splitlines() if "diff --git" in line]
|
|
assert len(diffs) == 1
|
|
assert diffs[0] == "diff --git a/bar b/bar"
|
|
|
|
|
|
if __name__ == "__main__":
|
|
mozunit.main()
|