1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
|
# 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/.
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.dir)
assert vcs.working_directory_clean()
# Modify both foo and bar
repo.execute_next_step()
assert not vcs.working_directory_clean()
# Commit just bar
vcs.commit(
message="Modify bar\n\nbut not baz",
author="Testing McTesterson <test@example.org>",
date="2017-07-14 02:40:00 UTC",
paths=["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,%aD,%B"]
patch_cmd = ["log", "-1", "-p"]
else:
log_cmd = [
"log",
"-l",
"1",
"-T",
"{person(author)},{email(author)},{date|rfc822date},{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,Fri, 14 "
"Jul 2017 02:40:00 +0000,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()
|
