Fix queue handling to remove the dependency from repobuild, and have a cancel method
This commit is contained in:
parent
24ab0ae53a
commit
5f605b7cc8
7 changed files with 95 additions and 24 deletions
|
@ -1331,6 +1331,13 @@ class TestRepositoryBuildResource(ApiTestCase):
|
|||
self.assertEquals(1, len(json['builds']))
|
||||
self.assertEquals(uuid, json['builds'][0]['id'])
|
||||
|
||||
# Find the build's queue item.
|
||||
build_ref = database.RepositoryBuild.get(uuid=uuid)
|
||||
queue_item = database.QueueItem.get(id=build_ref.queue_id)
|
||||
|
||||
self.assertTrue(queue_item.available)
|
||||
self.assertTrue(queue_item.retries_remaining > 0)
|
||||
|
||||
# Cancel the build.
|
||||
self.deleteResponse(RepositoryBuildResource,
|
||||
params=dict(repository=ADMIN_ACCESS_USER + '/simple', build_uuid=uuid),
|
||||
|
@ -1342,6 +1349,12 @@ class TestRepositoryBuildResource(ApiTestCase):
|
|||
|
||||
self.assertEquals(0, len(json['builds']))
|
||||
|
||||
# Check for the build's queue item.
|
||||
try:
|
||||
database.QueueItem.get(id=build_ref.queue_id)
|
||||
self.fail('QueueItem still exists for build')
|
||||
except database.QueueItem.DoesNotExist:
|
||||
pass
|
||||
|
||||
def test_attemptcancel_scheduledbuild(self):
|
||||
self.login(ADMIN_ACCESS_USER)
|
||||
|
|
Reference in a new issue