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
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
|
# 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 os
import subprocess
import textwrap
import uuid
import mozunit
import pytest
from mozversioncontrol import MissingVCSExtension, get_repository_object
def test_push_to_try(repo, monkeypatch):
if repo.vcs == "src":
pytest.skip("src repo cannot push")
commit_message = "commit message"
vcs = get_repository_object(repo.dir)
captured_commands = []
captured_inputs = []
def fake_run(*args, **kwargs):
cmd = args[0]
captured_commands.append(cmd)
if cmd[1] == "var" and cmd[2] in ("GIT_AUTHOR_IDENT", "GIT_COMMITTER_IDENT"):
return "FooBar <foobar@example.com> 0 +0000"
if cmd[1:] == ("rev-parse", "HEAD"):
return "0987654321098765432109876543210987654321"
if cmd[1:] == ("fast-import", "--quiet"):
if input := kwargs.get("input"):
captured_inputs.append(input)
return "1234567890123456789012345678901234567890"
if os.path.basename(cmd[0]).startswith("hg") and cmd[1] == "--version":
return "version 6.7"
return ""
def normalize_fake_run(*args, **kwargs):
if (
kwargs.get("text")
or kwargs.get("universal_newlines")
or kwargs.get("encoding")
):
return fake_run(*args, **kwargs)
if input := kwargs.get("input"):
kwargs["input"] = input.decode("utf-8")
return fake_run(*args, **kwargs).encode("utf-8")
def fake_uuid():
return "974284fd-f395-4a15-a9d7-814a71241242"
monkeypatch.setattr(subprocess, "check_output", normalize_fake_run)
monkeypatch.setattr(subprocess, "check_call", normalize_fake_run)
monkeypatch.setattr(uuid, "uuid4", fake_uuid)
vcs.push_to_try(
commit_message,
{
"extra-file": "content",
"other/extra-file": "content2",
},
)
tool = vcs._tool
if repo.vcs == "hg":
expected = [
(str(tool), "--version"),
(
str(tool),
"--config",
"extensions.automv=",
"addremove",
os.path.join(vcs.path, "extra-file"),
os.path.join(vcs.path, "other", "extra-file"),
),
(str(tool), "push-to-try", "-m", commit_message),
(str(tool), "revert", "-a"),
]
expected_inputs = []
elif repo.vcs == "git":
expected = [
(str(tool), "cinnabar", "--version"),
(str(tool), "rev-parse", "HEAD"),
(str(tool), "var", "GIT_AUTHOR_IDENT"),
(str(tool), "var", "GIT_COMMITTER_IDENT"),
(str(tool), "fast-import", "--quiet"),
(
str(tool),
"-c",
"cinnabar.data=never",
"push",
"hg::ssh://hg.mozilla.org/try",
"+1234567890123456789012345678901234567890:refs/heads/branches/default/tip",
),
(
str(tool),
"update-ref",
"-m",
"mach try: push",
"HEAD",
"1234567890123456789012345678901234567890",
"0987654321098765432109876543210987654321",
),
(
str(tool),
"update-ref",
"-m",
"mach try: restore",
"HEAD",
"0987654321098765432109876543210987654321",
"1234567890123456789012345678901234567890",
),
]
expected_inputs = [
textwrap.dedent(
f"""\
commit refs/machtry/974284fd-f395-4a15-a9d7-814a71241242
mark :1
author FooBar <foobar@example.com> 0 +0000
committer FooBar <foobar@example.com> 0 +0000
data {len(commit_message)}
{commit_message}
from 0987654321098765432109876543210987654321
M 100644 inline extra-file
data 7
content
M 100644 inline other/extra-file
data 8
content2
reset refs/machtry/974284fd-f395-4a15-a9d7-814a71241242
from 0000000000000000000000000000000000000000
get-mark :1
"""
),
]
else:
assert repo.vcs == "jj"
expected = [
(str(vcs._git._tool), "cinnabar", "--version"),
(str(tool), "debug", "snapshot"),
(
str(tool),
"operation",
"log",
"-n1",
"--no-graph",
"-T",
"id.short(16)",
),
(str(tool), "new", "-m", "commit message", "latest((@ ~ empty()) | @-)"),
(str(tool), "log", "-n0"),
(
str(tool),
"--ignore-working-copy",
"log",
"--no-graph",
"-n1",
"-r",
"@",
"-T",
"change_id.short()",
),
(str(vcs._git._tool), "remote"),
(
str(vcs._git._tool),
"remote",
"add",
"mach_tryserver",
"hg::ssh://hg.mozilla.org/try",
),
(str(tool), "git", "import"),
(
str(tool),
"git",
"push",
"--remote",
"mach_tryserver",
"--change",
None,
"--allow-new",
"--allow-empty-description",
),
(str(tool), "operation", "restore", ""),
(str(tool), "git", "remote", "remove", "mach_tryserver"),
]
expected_inputs = []
for i, value in enumerate(captured_commands):
assert value == expected[i]
assert len(captured_commands) == len(expected)
for i, value in enumerate(captured_inputs):
assert value == expected_inputs[i]
assert len(captured_inputs) == len(expected_inputs)
def test_push_to_try_missing_extensions(repo, monkeypatch):
if repo.vcs not in ("git", "jj"):
return
vcs = get_repository_object(repo.dir)
orig = vcs._run
def cinnabar_raises(*args, **kwargs):
# Simulate not having git cinnabar
if args[0] == "cinnabar":
raise subprocess.CalledProcessError(1, args)
return orig(*args, **kwargs)
monkeypatch.setattr(vcs, "_run", cinnabar_raises)
if hasattr(vcs, "_git"):
monkeypatch.setattr(vcs._git, "_run", cinnabar_raises)
with pytest.raises(MissingVCSExtension):
vcs.push_to_try("commit message")
if __name__ == "__main__":
mozunit.main()
|
