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
|
from twisted.internet import defer, reactor
from twisted.trial import unittest
from buildbot.sourcestamp import SourceStamp
from buildbot.process.base import BuildRequest
from buildbot.process.properties import Properties
from buildbot.status import builder, base, words
from buildbot.changes.changes import Change
from buildbot.test.runutils import RunMixin
"""Testcases for master.botmaster.shouldMergeRequests.
"""
master_cfg = """from buildbot.process import factory
from buildbot.steps import dummy
from buildbot.buildslave import BuildSlave
f = factory.BuildFactory([
dummy.Dummy(timeout=0),
])
BuildmasterConfig = c = {}
c['slaves'] = [BuildSlave('bot1', 'sekrit')]
c['schedulers'] = []
c['builders'] = []
c['builders'].append({'name':'dummy', 'slavename':'bot1',
'builddir': 'dummy', 'factory': f})
c['slavePortnum'] = 0
%s
c['mergeRequests'] = mergeRequests
"""
class MergeRequestsTest(RunMixin, unittest.TestCase):
def do_test(self, mergefun, results, reqs = None):
R = BuildRequest
S = SourceStamp
c1 = Change("alice", [], "changed stuff", branch="branch1")
c2 = Change("alice", [], "changed stuff", branch="branch1")
c3 = Change("alice", [], "changed stuff", branch="branch1")
c4 = Change("alice", [], "changed stuff", branch="branch1")
c5 = Change("alice", [], "changed stuff", branch="branch1")
c6 = Change("alice", [], "changed stuff", branch="branch1")
if reqs is None:
reqs = (R("why", S("branch1", None, None, None), 'test_builder'),
R("why2", S("branch1", "rev1", None, None), 'test_builder'),
R("why not", S("branch1", "rev1", None, None), 'test_builder'),
R("why3", S("branch1", "rev2", None, None), 'test_builder'),
R("why4", S("branch2", "rev2", None, None), 'test_builder'),
R("why5", S("branch1", "rev1", (3, "diff"), None), 'test_builder'),
R("changes", S("branch1", None, None, [c1,c2,c3]), 'test_builder'),
R("changes", S("branch1", None, None, [c4,c5,c6]), 'test_builder'),
)
m = self.master
m.loadConfig(master_cfg % mergefun)
m.readConfig = True
m.startService()
builder = self.control.getBuilder('dummy')
for req in reqs:
builder.requestBuild(req)
d = self.connectSlave()
d.addCallback(self.waitForBuilds, results)
return d
def waitForBuilds(self, r, results):
d = self.master.botmaster.waitUntilBuilderIdle('dummy')
d.addCallback(self.checkresults, results)
return d
def checkresults(self, builder, results):
s = builder.builder_status
builds = list(s.generateFinishedBuilds())
builds.reverse()
self.assertEqual(len(builds), len(results))
for i in xrange(len(builds)):
b = builds[i]
r = results[i]
ss = b.getSourceStamp()
self.assertEquals(b.getReason(), r['reason'])
self.assertEquals(ss.branch, r['branch'])
self.assertEquals(len(ss.changes), r['changecount'])
# print b.getReason(), ss.branch, len(ss.changes), ss.revision
def testDefault(self):
return self.do_test('mergeRequests = None',
({'reason': 'why',
'branch': 'branch1',
'changecount': 0},
{'reason': 'why2, why not',
'branch': 'branch1',
'changecount': 0},
{'reason': 'why3',
'branch': 'branch1',
'changecount': 0},
{'reason': 'why4',
'branch': 'branch2',
'changecount': 0},
{'reason': 'why5',
'branch': 'branch1',
'changecount': 0},
{'reason': 'changes',
'branch': 'branch1',
'changecount': 6},
))
def testNoMerges(self):
mergefun = """def mergeRequests(builder, req1, req2):
return False
"""
return self.do_test(mergefun,
({'reason': 'why',
'branch': 'branch1',
'changecount': 0},
{'reason': 'why2',
'branch': 'branch1',
'changecount': 0},
{'reason': 'why not',
'branch': 'branch1',
'changecount': 0},
{'reason': 'why3',
'branch': 'branch1',
'changecount': 0},
{'reason': 'why4',
'branch': 'branch2',
'changecount': 0},
{'reason': 'why5',
'branch': 'branch1',
'changecount': 0},
{'reason': 'changes',
'branch': 'branch1',
'changecount': 3},
{'reason': 'changes',
'branch': 'branch1',
'changecount': 3},
))
def testReasons(self):
mergefun = """def mergeRequests(builder, req1, req2):
return req1.reason == req2.reason
"""
return self.do_test(mergefun,
({'reason': 'why',
'branch': 'branch1',
'changecount': 0},
{'reason': 'why2',
'branch': 'branch1',
'changecount': 0},
{'reason': 'why not',
'branch': 'branch1',
'changecount': 0},
{'reason': 'why3',
'branch': 'branch1',
'changecount': 0},
{'reason': 'why4',
'branch': 'branch2',
'changecount': 0},
{'reason': 'why5',
'branch': 'branch1',
'changecount': 0},
{'reason': 'changes',
'branch': 'branch1',
'changecount': 6},
))
def testProperties(self):
mergefun = """def mergeRequests(builder, req1, req2):
return req1.properties == req2.properties
"""
R = BuildRequest
S = SourceStamp
p1 = Properties(first="value")
p2 = Properties(first="other value")
reqs = (R("why", S("branch1", None, None, None), 'test_builder',
properties = p1),
R("why", S("branch1", None, None, None), 'test_builder',
properties = p1),
R("why", S("branch1", None, None, None), 'test_builder',
properties = p2),
R("why", S("branch1", None, None, None), 'test_builder',
properties = p2),
)
return self.do_test(mergefun,
({'reason': 'why',
'branch': 'branch1',
'changecount': 0},
{'reason': 'why',
'branch': 'branch1',
'changecount': 0},
),
reqs=reqs)
|
