Merge lp:~acsone-openerp/anybox.buildbot.openerp/trunk-bug-1284060-lmi into lp:anybox.buildbot.openerp

[Laurent Mignon (Acsone)]

[FIX] lp:1284060 Use the parameter 'branches' of the GitPoller to track multiple branches of the same repository

[Georges Racinet (gracinet)]

Well done, thanks

For the record, there's a similar problem with Mercurial, but it lies upstream, in buildbot's HgPoller (I have to submit a patch there)

review: Approve

=== modified file 'anybox/buildbot/openerp/tests/data/manifest_watch.cfg'
--- anybox/buildbot/openerp/tests/data/manifest_watch.cfg	2013-10-27 10:58:21 +0000
+++ anybox/buildbot/openerp/tests/data/manifest_watch.cfg	2014-02-24 13:14:53 +0000
@@ -15,3 +15,7 @@
 buildout = standalone buildouts/7.0.cfg
 watch = git [e-mail]:my/repo master
 
+[w_git_develop]
+buildout = standalone buildouts/7.0.cfg
+watch = git [e-mail]:my/repo develop
+

=== modified file 'anybox/buildbot/openerp/tests/test_watch.py'
--- anybox/buildbot/openerp/tests/test_watch.py	2013-10-27 12:07:45 +0000
+++ anybox/buildbot/openerp/tests/test_watch.py	2014-02-24 13:14:53 +0000
@@ -25,7 +25,7 @@
         # BzrPoller does translation of lp: addresses
         self.assertTrue(bzr.url.endswith('openobject-server/6.1'))
         self.assertEquals(git.repourl, '[e-mail]:my/repo')
-        self.assertEquals(git.branches[0], 'master')
+        self.assertEquals(sorted(git.branches), ['develop', 'master'])
 
     def test_url_rewrite(self):
         updater = self.watcher(

=== modified file 'anybox/buildbot/openerp/watch.py'
--- anybox/buildbot/openerp/watch.py	2013-10-26 19:59:56 +0000
+++ anybox/buildbot/openerp/watch.py	2014-02-24 13:14:53 +0000
@@ -85,10 +85,10 @@
                 yield BzrPoller(url, poll_interval=poll_interval,
                                 branch_name=branch_name)
             elif vcs == 'git':
-                for ms in minor_specs:
-                    yield GitPoller(url, branch=ms[0],
-                                    workdir=os.path.join('gitpoller', h),
-                                    pollInterval=poll_interval)
+                branches = [ms[0] for ms in minor_specs]
+                yield GitPoller(url, branches=branches,
+                                workdir=os.path.join('gitpoller', h),
+                                pollInterval=poll_interval)
 
     def check_paths(self, paths):
         missing = [path for path in paths if not os.path.isfile(path)]