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
|
#!/usr/bin/env python3
# Copyright 2015 the V8 project authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
import mergeinfo
import shutil
import unittest
from collections import namedtuple
from os import path
from subprocess import Popen, PIPE, check_call
TEST_CONFIG = {
"GIT_REPO": "/tmp/test-v8-search-related-commits",
}
class TestMergeInfo(unittest.TestCase):
base_dir = TEST_CONFIG["GIT_REPO"]
def _execute_git(self, git_args):
fullCommand = ["git", "-C", self.base_dir] + git_args
p = Popen(args=fullCommand, stdin=PIPE,
stdout=PIPE, stderr=PIPE)
output, err = p.communicate()
rc = p.returncode
if rc != 0:
raise Exception(err)
return output
def _update_origin(self):
# Fetch from origin to get/update the origin/main branch
self._execute_git(['fetch', 'origin'])
def setUp(self):
if path.exists(self.base_dir):
shutil.rmtree(self.base_dir)
check_call(["git", "init", self.base_dir])
# Add fake remote with name 'origin'
self._execute_git(['remote', 'add', 'origin', self.base_dir])
# Initial commit
message = '''Initial commit'''
self._make_empty_commit(message)
def tearDown(self):
if path.exists(self.base_dir):
shutil.rmtree(self.base_dir)
def _assert_correct_standard_result(
self, result, all_commits, hash_of_first_commit):
self.assertEqual(len(result), 1, "Main commit not found")
self.assertTrue(
result.get(hash_of_first_commit),
"Main commit is wrong")
self.assertEqual(
len(result[hash_of_first_commit]),
1,
"Child commit not found")
self.assertEqual(
all_commits[2],
result[hash_of_first_commit][0],
"Child commit wrong")
def _get_commits(self):
commits = self._execute_git(
["log", "--format=%H", "--reverse"]).splitlines()
return commits
def _get_branches(self, hash):
return mergeinfo.get_branches_for_commit(self.base_dir, hash)
def _make_empty_commit(self, message):
self._execute_git(["commit", "--allow-empty", "-m", message])
self._update_origin()
return self._get_commits()[-1]
def testCanDescribeCommit(self):
commits = self._get_commits()
hash_of_first_commit = commits[0]
result = mergeinfo.describe_commit(
self.base_dir,
hash_of_first_commit).splitlines()
self.assertEqual(
result[0],
'commit ' + hash_of_first_commit)
def testCanDescribeCommitSingleLine(self):
commits = self._get_commits()
hash_of_first_commit = commits[0]
result = mergeinfo.describe_commit(
self.base_dir,
hash_of_first_commit, True).splitlines()
self.assertEqual(
str(result[0]),
str(hash_of_first_commit[0:7]) + ' Initial commit')
def testSearchFollowUpCommits(self):
commits = self._get_commits()
hash_of_first_commit = commits[0]
message = 'Follow-up commit of ' + hash_of_first_commit
self._make_empty_commit(message)
self._make_empty_commit(message)
self._make_empty_commit(message)
commits = self._get_commits()
message = 'Not related commit'
self._make_empty_commit(message)
followups = mergeinfo.get_followup_commits(
self.base_dir,
hash_of_first_commit)
self.assertEqual(set(followups), set(commits[1:]))
def testSearchMerges(self):
self._execute_git(['branch', 'test'])
self._execute_git(['checkout', 'main'])
message = 'real initial commit'
self._make_empty_commit(message)
commits = self._get_commits()
hash_of_first_commit = commits[0]
self._execute_git(['checkout', 'test'])
message = 'Not related commit'
self._make_empty_commit(message)
# This should be found
message = 'Merge ' + hash_of_first_commit
hash_of_hit = self._make_empty_commit(message)
# This should be ignored
message = 'Cr-Branched-From: ' + hash_of_first_commit
hash_of_ignored = self._make_empty_commit(message)
self._execute_git(['checkout', 'main'])
followups = mergeinfo.get_followup_commits(
self.base_dir,
hash_of_first_commit)
# Check if follow ups and merges are not overlapping
self.assertEqual(len(followups), 0)
message = 'Follow-up commit of ' + hash_of_first_commit
hash_of_followup = self._make_empty_commit(message)
merges = mergeinfo.get_merge_commits(self.base_dir, hash_of_first_commit)
# Check if follow up is ignored
self.assertTrue(hash_of_followup not in merges)
# Check for proper return of merges
self.assertTrue(hash_of_hit in merges)
self.assertTrue(hash_of_ignored not in merges)
def testIsLkgr(self):
commits = self._get_commits()
hash_of_first_commit = commits[0]
self._make_empty_commit('This one is the lkgr head')
self._execute_git(['branch', 'remotes/origin/lkgr'])
hash_of_not_lkgr = self._make_empty_commit('This one is not yet lkgr')
branches = self._get_branches(hash_of_first_commit);
self.assertTrue(mergeinfo.is_lkgr(branches))
branches = self._get_branches(hash_of_not_lkgr);
self.assertFalse(mergeinfo.is_lkgr(branches))
def testShowFirstCanary(self):
commits = self._get_commits()
hash_of_first_commit = commits[0]
branches = self._get_branches(hash_of_first_commit);
self.assertEqual(mergeinfo.get_first_canary(branches), 'No Canary coverage')
self._execute_git(['branch', 'remotes/origin/chromium/2345'])
self._execute_git(['branch', 'remotes/origin/chromium/2346'])
branches = self._get_branches(hash_of_first_commit);
self.assertEqual(mergeinfo.get_first_canary(branches), '2345')
def testFirstV8Version(self):
commits = self._get_commits()
hash_of_first_commit = commits[0]
self._execute_git(['branch', 'remotes/origin/chromium/2345'])
self._execute_git(['branch', 'remotes/origin/chromium/2346'])
branches = self._get_branches(hash_of_first_commit);
self.assertEqual(mergeinfo.get_first_v8_version(branches), '--')
self._execute_git(['branch', 'remotes/origin/5.7.1'])
self._execute_git(['branch', 'remotes/origin/5.8.1'])
branches = self._get_branches(hash_of_first_commit);
self.assertEqual(mergeinfo.get_first_v8_version(branches), '5.7.1')
self._execute_git(['branch', 'remotes/origin/5.6.1'])
branches = self._get_branches(hash_of_first_commit);
self.assertEqual(mergeinfo.get_first_v8_version(branches), '5.6.1')
if __name__ == "__main__":
unittest.main()
|
