ChangeSourceData: Address review comments

buildbot · May 5, 2013 · bb98d16 · bb98d16
1 parent 8bab603
commit bb98d16
Show file tree

Hide file tree

Showing 9 changed files with 8 additions and 17 deletions.
diff --git a/master/buildbot/changes/bonsaipoller.py b/master/buildbot/changes/bonsaipoller.py
@@ -202,8 +202,7 @@ def _getRevision(self):
 
 
 class BonsaiPoller(base.PollingChangeSource):
-    compare_attrs = base.PollingChangeSource.compare_attrs + \
-                    ("bonsaiURL", "pollInterval", "tree",
+    compare_attrs = ("bonsaiURL", "pollInterval", "tree",
                      "module", "branch", "cvsroot")
 
     def __init__(self, bonsaiURL, module, branch, tree="default",

diff --git a/master/buildbot/changes/gerritchangesource.py b/master/buildbot/changes/gerritchangesource.py
@@ -26,8 +26,7 @@ class GerritChangeSource(base.ChangeSource):
     """This source will maintain a connection to gerrit ssh server
     that will provide us gerrit events in json format."""
 
-    compare_attrs = base.ChangeSource.compare_attrs + \
-                     ("gerritserver", "gerritport")
+    compare_attrs = ("gerritserver", "gerritport")
 
     STREAM_GOOD_CONNECTION_TIME = 120
     "(seconds) connections longer than this are considered good, and reset the backoff timer"

diff --git a/master/buildbot/changes/gitpoller.py b/master/buildbot/changes/gitpoller.py
@@ -27,8 +27,7 @@ class GitPoller(base.PollingChangeSource, StateMixin):
     """This source will poll a remote git repo for changes and submit
     them to the change master."""
 
-    compare_attrs = base.PollingChangeSource.compare_attrs + \
-                    ("repourl", "branches", "workdir",
+    compare_attrs = ("repourl", "branches", "workdir",
                      "pollInterval", "gitbin", "usetimestamps",
                      "category", "project")
 

diff --git a/master/buildbot/changes/hgpoller.py b/master/buildbot/changes/hgpoller.py
@@ -26,8 +26,7 @@ class HgPoller(base.PollingChangeSource):
     """This source will poll a remote hg repo for changes and submit
     them to the change master."""
 
-    compare_attrs = base.PollingChangeSource.compare_attrs + \
-                   ("repourl", "branch", "workdir",
+    compare_attrs = ("repourl", "branch", "workdir",
                      "pollInterval", "hgpoller", "usetimestamps",
                      "category", "project")
 

diff --git a/master/buildbot/changes/p4poller.py b/master/buildbot/changes/p4poller.py
@@ -45,8 +45,7 @@ class P4Source(base.PollingChangeSource, util.ComparableMixin):
     """This source will poll a perforce repository for changes and submit
     them to the change master."""
 
-    compare_attrs = base.PollingChangeSource.compare_attrs + \
-                    ("p4port", "p4user", "p4passwd", "p4base",
+    compare_attrs = ("p4port", "p4user", "p4passwd", "p4base",
                      "p4bin", "pollInterval")
 
     env_vars = ["P4CLIENT", "P4PORT", "P4PASSWD", "P4USER",

diff --git a/master/buildbot/changes/pb.py b/master/buildbot/changes/pb.py
@@ -98,8 +98,7 @@ def perspective_addChange(self, changedict):
         return d
 
 class PBChangeSource(config.ReconfigurableServiceMixin, base.ChangeSource):
-    compare_attrs = base.ChangeSource.compare_attrs + \
-                    ("user", "passwd", "port", "prefix", "port")
+    compare_attrs = ("user", "passwd", "port", "prefix", "port")
 
     def __init__(self, user="change", passwd="changepw", port=None,
             prefix=None, name=None):

diff --git a/master/buildbot/changes/svnpoller.py b/master/buildbot/changes/svnpoller.py
@@ -68,8 +68,7 @@ class SVNPoller(base.PollingChangeSource, util.ComparableMixin):
     master.
     """
 
-    compare_attrs = base.PollingChangeSource.compare_attrs + \
-                    ("svnurl", "split_file",
+    compare_attrs = ("svnurl", "split_file",
                      "svnuser", "svnpasswd", "project",
                      "pollInterval", "histmax",
                      "svnbin", "category", "cachepath")

diff --git a/master/buildbot/db/changesources.py b/master/buildbot/db/changesources.py
@@ -14,7 +14,6 @@
 # Copyright Buildbot Team Members
 
 import sqlalchemy as sa
-import sqlalchemy.exc
 from twisted.internet import defer
 from buildbot.db import base
 

diff --git a/master/buildbot/db/model.py b/master/buildbot/db/model.py
@@ -199,8 +199,7 @@ class Model(base.DBConnectorComponent):
     # linked to a master that is inactive can be unlinked by any master.  This
     # is a separate table so that we can "claim" changesources on a master by
     # inserting; this has better support in database servers for ensuring that
-    # exactly one claim succeeds.  The ID column is present for external users;
-    # see bug #1053.
+    # exactly one claim succeeds.
     changesource_masters = sa.Table('changesource_masters', metadata,
         sa.Column('changesourceid', sa.Integer, sa.ForeignKey('changesources.id'),
             nullable=False, primary_key=True),