Merge branch 'master' of github.com:buildbot/buildbot

* 'master' of github.com:buildbot/buildbot: GerritChangeSource should set repository attribute
buildbot · Feb 23, 2012 · bcbb713 · bcbb713
2 parents 2011811 + faa6694
commit bcbb713
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/master/buildbot/changes/gerritchangesource.py b/master/buildbot/changes/gerritchangesource.py
@@ -125,6 +125,8 @@ def eventReceived_patchset_created(self, properties, event):
         return self.addChange(dict(
                 author="%s <%s>" % (change["owner"]["name"], change["owner"]["email"]),
                 project=change["project"],
+                repository="ssh://%s@%s:%s/%s" % (
+                    self.username, self.gerritserver, self.gerritport, change["project"]),
                 branch=change["branch"]+"/"+change["number"],
                 revision=event["patchSet"]["revision"],
                 revlink=change["url"],
@@ -142,6 +144,8 @@ def eventReceived_ref_updated(self, properties, event):
         return self.addChange(dict(
                 author=author,
                 project=ref["project"],
+                repository="ssh://%s@%s:%s/%s" % (
+                    self.username, self.gerritserver, self.gerritport, ref["project"]),
                 branch=ref["refName"],
                 revision=ref["newRev"],
                 comments="Gerrit: patchset(s) merged.",

diff --git a/master/buildbot/test/unit/test_changes_gerritchangesource.py b/master/buildbot/test/unit/test_changes_gerritchangesource.py
@@ -63,6 +63,7 @@ def check(_):
             self.assertEqual(c['branch'], "br/4321")
             self.assertEqual(c['revision'], "abcdef")
             self.assertEqual(c['revlink'], "http://buildbot.net")
+            self.assertEqual(c['repository'], "ssh://someuser@somehost:29418/pr")
             self.assertEqual(c['comments'], "fix 1234")
             self.assertEqual(c['files'], [ 'unknown' ])
             self.assertEqual(c['properties']['event.change.subject'], 'fix 1234')