launchpad-reviewers team mailing list archive
-
launchpad-reviewers team
-
Mailing list archive
-
Message #15873
[Merge] lp:~cjwatson/launchpad/testfix-destroy-builder-aborted into lp:launchpad
Colin Watson has proposed merging lp:~cjwatson/launchpad/testfix-destroy-builder-aborted into lp:launchpad.
Commit message:
Remove another reference to AbortedSlave.
Requested reviews:
Launchpad code reviewers (launchpad-reviewers)
For more details, see:
https://code.launchpad.net/~cjwatson/launchpad/testfix-destroy-builder-aborted/+merge/183598
I missed a reference to AbortedSlave in https://code.launchpad.net/~cjwatson/launchpad/destroy-builder-aborted/+merge/183460. Sorry.
--
https://code.launchpad.net/~cjwatson/launchpad/testfix-destroy-builder-aborted/+merge/183598
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~cjwatson/launchpad/testfix-destroy-builder-aborted into lp:launchpad.
=== modified file 'lib/lp/soyuz/tests/test_binarypackagebuildbehavior.py'
--- lib/lp/soyuz/tests/test_binarypackagebuildbehavior.py 2013-09-02 08:11:58 +0000
+++ lib/lp/soyuz/tests/test_binarypackagebuildbehavior.py 2013-09-03 09:29:47 +0000
@@ -27,7 +27,6 @@
IBuildFarmJobBehavior,
)
from lp.buildmaster.tests.mock_slaves import (
- AbortedSlave,
AbortingSlave,
BuildingSlave,
OkSlave,
@@ -411,17 +410,6 @@
d = self.interactor.updateBuild(self.candidate)
return d.addCallback(got_update)
- def test_aborted_collection(self):
- # The builder aborted the job.
- self.patch(BuilderSlave, 'makeBuilderSlave',
- FakeMethod(AbortedSlave()))
-
- def got_update(ignored):
- self.assertEqual(BuildStatus.NEEDSBUILD, self.build.status)
-
- d = self.interactor.updateBuild(self.candidate)
- return d.addCallback(got_update)
-
def test_aborting_collection(self):
# The builder is in the process of aborting.
self.patch(BuilderSlave, 'makeBuilderSlave',
Follow ups