Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/buildbot/buildbot/test/test_mergerequests.py
diff options
context:
space:
mode:
Diffstat (limited to 'buildbot/buildbot/test/test_mergerequests.py')
-rw-r--r--buildbot/buildbot/test/test_mergerequests.py196
1 files changed, 0 insertions, 196 deletions
diff --git a/buildbot/buildbot/test/test_mergerequests.py b/buildbot/buildbot/test/test_mergerequests.py
deleted file mode 100644
index e176cf1..0000000
--- a/buildbot/buildbot/test/test_mergerequests.py
+++ /dev/null
@@ -1,196 +0,0 @@
-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)