Merge pull request #7583 from mokibit/delete-deprecated-setWorkerState

Delete deprecated Worker.setWorkerState()
buildbot · May 7, 2024 · ea8f9f9 · ea8f9f9
2 parents e6b103f + 4952079
commit ea8f9f9
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 37 deletions.
diff --git a/master/buildbot/data/workers.py b/master/buildbot/data/workers.py
@@ -20,7 +20,6 @@
 from buildbot.data import exceptions
 from buildbot.data import types
 from buildbot.util import identifiers
-from buildbot.warnings import warn_deprecated
 
 
 class Db2DataMixin:
@@ -171,19 +170,6 @@ def workerMissing(self, workerid, masterid, last_connection, notify):
  bs['notify'] = notify
  self.produceEvent(bs, 'missing')
 
- @base.updateMethod
- @defer.inlineCallbacks
- def setWorkerState(self, workerid, paused, graceful):
- warn_deprecated(
- "3.10.0",
- "setWorkerState() has been deprecated, "
- "please use set_worker_paused() and/or set_worker_graceful()",
- )
- yield self.master.db.workers.set_worker_paused(workerid=workerid, paused=paused)
- yield self.master.db.workers.set_worker_graceful(workerid=workerid, graceful=graceful)
- bs = yield self.master.data.get(('workers', workerid))
- self.produceEvent(bs, 'state_updated')
-
  @base.updateMethod
  @defer.inlineCallbacks
  def set_worker_paused(self, workerid, paused, pause_reason=None):

diff --git a/master/buildbot/test/fake/fakedata.py b/master/buildbot/test/fake/fakedata.py
@@ -470,11 +470,6 @@ def workerMissing(self, workerid, masterid, last_connection, notify):
  def schedulerEnable(self, schedulerid, v):
  return self.master.db.schedulers.enable(schedulerid, v)
 
- @defer.inlineCallbacks
- def setWorkerState(self, workerid, paused, graceful):
- yield self.master.db.workers.set_worker_paused(workerid=workerid, paused=paused)
- yield self.master.db.workers.set_worker_graceful(workerid=workerid, graceful=graceful)
-
  def set_worker_paused(self, workerid, paused, pause_reason=None):
  return self.master.db.workers.set_worker_paused(workerid, paused, pause_reason=pause_reason)
 

diff --git a/master/buildbot/test/unit/data/test_workers.py b/master/buildbot/test/unit/data/test_workers.py
@@ -175,14 +175,6 @@ def test_get_missing(self):
 
  self.assertEqual(worker, None)
 
- @defer.inlineCallbacks
- def test_setWorkerState(self):
- yield self.master.data.updates.setWorkerState(2, True, False)
- worker = yield self.callGet(('workers', 2))
- self.validateData(worker)
- self.assertEqual(worker['paused'], True)
- self.assertEqual(worker['graceful'], False)
-
  @defer.inlineCallbacks
  def test_set_worker_paused(self):
  yield self.master.data.updates.set_worker_paused(2, True, "reason")

diff --git a/master/docs/developer/database/workers.rst b/master/docs/developer/database/workers.rst
@@ -93,16 +93,6 @@ Workers connector
  Unregister all the workers configured to a master for given builders.
  This shall happen when master is disabled or before reconfiguration.
 
- .. py:method:: setWorkerState(workerid, paused, graceful)
-
- :param integer workerid: the ID of the worker whose state is being changed
- :param integer paused: the paused state
- :param integer graceful: the graceful state
- :returns: Deferred
-
- Change the state of a worker (see definition of states above in worker dict description).
-
- This method is deprecated.
 
  .. py:method:: set_worker_paused(workerid, paused, pause_reason=None)