Don't send branch as ref/heads/master

buildbot · Apr 18, 2014 · 6317369 · 6317369
1 parent f0bcdb2
commit 6317369
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/master/buildbot/changes/gitpoller.py b/master/buildbot/changes/gitpoller.py
@@ -281,7 +281,7 @@ def _process_changes(self, newRev, branch):
                 files=files,
                 comments=comments,
                 when_timestamp=epoch2datetime(timestamp),
-                branch=branch,
+                branch=self._removeHeads(branch),
                 category=self.category,
                 project=self.project,
                 repository=self.repourl,

diff --git a/master/buildbot/test/unit/test_changes_gitpoller.py b/master/buildbot/test/unit/test_changes_gitpoller.py
@@ -498,8 +498,7 @@ def cb(_):
             self.assertEqual(self.changes_added[0]['when_timestamp'],
                              epoch2datetime(1273258009))
             self.assertEqual(self.changes_added[0]['comments'], 'hello!')
-            self.assertEqual(self.changes_added[0]['branch'],
-                             'refs/heads/master')
+            self.assertEqual(self.changes_added[0]['branch'], 'master')
             self.assertEqual(self.changes_added[0]['files'], ['/etc/442'])
             self.assertEqual(self.changes_added[0]['src'], 'git')
 
@@ -631,8 +630,7 @@ def cb(_):
             self.assertEqual(self.changes_added[0]['when_timestamp'],
                              epoch2datetime(1273258009))
             self.assertEqual(self.changes_added[0]['comments'], 'hello!')
-            self.assertEqual(self.changes_added[0]['branch'],
-                             'refs/heads/master')
+            self.assertEqual(self.changes_added[0]['branch'], 'master')
             self.assertEqual(self.changes_added[0]['files'], ['/etc/442'])
             self.assertEqual(self.changes_added[0]['src'], 'git')
 
@@ -729,8 +727,7 @@ def cb(_):
             self.assertEqual(self.changes_added[0]['when_timestamp'],
                              epoch2datetime(1273258009))
             self.assertEqual(self.changes_added[0]['comments'], 'hello!')
-            self.assertEqual(self.changes_added[0]['branch'],
-                             'refs/heads/master')
+            self.assertEqual(self.changes_added[0]['branch'], 'master')
             self.assertEqual(self.changes_added[0]['files'], ['/etc/442'])
             self.assertEqual(self.changes_added[0]['src'], 'git')