Trac #2660 [nine] buildrequests data API uses popBooleanFilter for no…

…n-booleans - omit filters 'branch' and 'repository' - use popOneFilter instead of popFilter for bsid
buildbot · Jan 23, 2014 · cb004e0 · cb004e0
1 parent 36bd304
commit cb004e0
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 17 deletions.
diff --git a/master/buildbot/data/buildrequests.py b/master/buildbot/data/buildrequests.py
@@ -104,18 +104,12 @@ def get(self, resultSpec, kwargs):
         else:
             claimed = resultSpec.popBooleanFilter('claimed')
 
-        bsid = resultSpec.popFilter('buildsetid', 'eq')
-        if bsid:
-            bsid = bsid[0]
-        branch = resultSpec.popStringFilter('branch')
-        repository = resultSpec.popStringFilter('repository')
+        bsid = resultSpec.popOneFilter('buildsetid', 'eq')
         buildrequests = yield self.master.db.buildrequests.getBuildRequests(
             buildername=buildername,
             complete=complete,
             claimed=claimed,
-            bsid=bsid,
-            branch=branch,
-            repository=repository)
+            bsid=bsid)
         if buildrequests:
 
             @defer.inlineCallbacks

diff --git a/master/buildbot/data/resultspec.py b/master/buildbot/data/resultspec.py
@@ -69,6 +69,10 @@ def popFilter(self, field, op):
                 self.filters.remove(f)
                 return f.values
 
+    def popOneFilter(self, field, op):
+        v = self.popFilter(field, op)
+        return v[0] if v is not None else None
+
     def popBooleanFilter(self, field):
         eqVals = self.popFilter(field, 'eq')
         if eqVals and len(eqVals) == 1:

diff --git a/master/buildbot/test/unit/test_data_buildrequests.py b/master/buildbot/test/unit/test_data_buildrequests.py
@@ -157,9 +157,7 @@ def testGetNoFilters(self):
             buildername=None,
             bsid=None,
             complete=None,
-            claimed=None,
-            branch=None,
-            repository=None)
+            claimed=None)
 
     @defer.inlineCallbacks
     def testGetFilters(self):
@@ -177,9 +175,7 @@ def testGetFilters(self):
             buildername=None,
             bsid=55,
             complete=False,
-            claimed=True,
-            branch='mybranch',
-            repository='myrepo')
+            claimed=True)
 
     @defer.inlineCallbacks
     def testGetClaimedByMasterIdFilters(self):
@@ -195,9 +191,7 @@ def testGetClaimedByMasterIdFilters(self):
             buildername=None,
             bsid=None,
             complete=None,
-            claimed=fakedb.FakeBuildRequestsComponent.MASTER_ID,
-            branch=None,
-            repository=None)
+            claimed=fakedb.FakeBuildRequestsComponent.MASTER_ID)
 
 
 class TestBuildRequest(interfaces.InterfaceTests, unittest.TestCase):