vbatts/quay
Archived
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Select the full RepositoryBuild record

Browse source 
If we just return the ID, then peewee just fills in the other fields with defaults (such as UUID).
This commit is contained in:
Joseph Schorr 2015-09-09 21:43:48 -04:00
parent 80b24494b5
commit 474fffd01f
2 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
data/model/build.py
View file

@ -175,11 +175,12 @@ def get_archivable_build():
.alias('candidates')) .alias('candidates'))
try: try:
return (RepositoryBuild found_id = (RepositoryBuild
.select(candidates.c.id) .select(candidates.c.id)
.from_(candidates) .from_(candidates)
.order_by(db_random_func()) .order_by(db_random_func())
.get()) .get())
return RepositoryBuild.get(id=found_id)
except RepositoryBuild.DoesNotExist: except RepositoryBuild.DoesNotExist:
return None return None

13
test/test_queries.py
View file

@ -24,17 +24,26 @@ class TestSpecificQueries(unittest.TestCase):
result = model.build.get_archivable_build() result = model.build.get_archivable_build()
self.assertIsNone(result) self.assertIsNone(result)
# Add a build that we know needs to be archived. # Add a build that cannot (yet) be archived.
repo = model.repository.get_repository(ADMIN_ACCESS_USER, SIMPLE_REPO) repo = model.repository.get_repository(ADMIN_ACCESS_USER, SIMPLE_REPO)
token = model.token.create_access_token(repo, 'write') token = model.token.create_access_token(repo, 'write')
created = RepositoryBuild.create(repository=repo, access_token=token, created = RepositoryBuild.create(repository=repo, access_token=token,
phase=model.build.BUILD_PHASE.COMPLETE, phase=model.build.BUILD_PHASE.WAITING,
logs_archived=False, job_config='{}', logs_archived=False, job_config='{}',
display_name='') display_name='')
# Make sure there are no archivable logs.
result = model.build.get_archivable_build()
self.assertIsNone(result)
# Change the build to being complete.
created.phase = model.build.BUILD_PHASE.COMPLETE
created.save()
# Make sure we now find an archivable build. # Make sure we now find an archivable build.
result = model.build.get_archivable_build() result = model.build.get_archivable_build()
self.assertEquals(created.id, result.id) self.assertEquals(created.id, result.id)
self.assertEquals(created.uuid, result.uuid)
if __name__ == '__main__': if __name__ == '__main__':
unittest.main() unittest.main()