add missing yields in @inlineCallbacks methods

Fixes: #5215 Fixes: 61b044f (" - use builderid as a foreign key instead of using buildername for the table buildrequests - addbuilset take a list of buildersID - check signatures for the BaseScheduler?'s addBuildsetForXxx methods") Fixes: c20481e ("test: Fix tests to wait for DB shutdown") Fixes: fb4c782 ("test: Use @defer.inlineCallbacks in httpclientservice tests")
buildbot · Mar 2, 2020 · 81d693a · 81d693a
1 parent d4bd273
commit 81d693a
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/master/buildbot/test/unit/test_process_buildrequestdistributor.py b/master/buildbot/test/unit/test_process_buildrequestdistributor.py
@@ -367,7 +367,7 @@ class TestMaybeStartBuilds(TestBRDBase):
 
     @defer.inlineCallbacks
     def setUp(self):
-        super().setUp()
+        yield super().setUp()
 
         self.startedBuilds = []
 

diff --git a/master/buildbot/test/unit/test_scripts_cleanupdb.py b/master/buildbot/test/unit/test_scripts_cleanupdb.py
@@ -134,7 +134,7 @@ class TestCleanupDbRealDb(db.RealDatabaseWithConnectorMixin, TestCleanupDb):
 
     @defer.inlineCallbacks
     def setUp(self):
-        super().setUp()
+        yield super().setUp()
 
         table_names = [
             'logs', 'logchunks', 'steps', 'builds', 'builders',

diff --git a/master/buildbot/test/unit/test_util_httpclientservice.py b/master/buildbot/test/unit/test_util_httpclientservice.py
@@ -128,8 +128,9 @@ def test_post_auth(self):
 
 class HTTPClientServiceTestTxRequestNoEncoding(HTTPClientServiceTestBase):
 
+    @defer.inlineCallbacks
     def setUp(self):
-        super().setUp()
+        yield super().setUp()
         self._http = self.successResultOf(
             httpclientservice.HTTPClientService.getService(self.parent, 'http://foo',
                                                            headers=self.base_headers,
@@ -229,8 +230,9 @@ def test_post_auth_digest(self):
 
 class HTTPClientServiceTestTReqNoEncoding(HTTPClientServiceTestBase):
 
+    @defer.inlineCallbacks
     def setUp(self):
-        super().setUp()
+        yield super().setUp()
         self.patch(httpclientservice.HTTPClientService, 'PREFER_TREQ', True)
         self._http = self.successResultOf(
             httpclientservice.HTTPClientService.getService(self.parent, 'http://foo',