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

Merge remote-tracking branch 'origin/master' into umask

Browse source 
Conflicts:
	initdb.py
	test/data/test.db
This commit is contained in:
yackob03 2014-01-22 11:53:20 -05:00
commit 459f30c123
46 changed files with 78463 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

25
initdb.py
View file

@ -104,7 +104,11 @@ def __generate_repository(user, name, description, is_public, permissions,
model.set_user_repo_permission(delegate.username, user.username, name,
role)
__create_subtree(repo, structure, None)
if isinstance(structure, list):
for s in structure:
__create_subtree(repo, s, None)
else:
__create_subtree(repo, structure, None)
return repo
@ -219,7 +223,7 @@ def populate_database():
(5, [], 'v4.0'),
(1, [(1, [], 'v5.0'), (1, [], 'v6.0')], None)],
None))
__generate_repository(new_user_2, 'publicrepo',
'Public repository pullable by the world.', True,
[], (10, [], 'latest'))
@ -265,6 +269,23 @@ def populate_database():
build.status_url = 'http://localhost:5000/test/build/status'
build.save()
__generate_repository(new_user_1, 'superwide', None, False, [],
[(10, [], 'latest2'),
(2, [], 'latest3'),
(2, [(1, [], 'latest11'), (2, [], 'latest12')], 'latest4'),
(2, [], 'latest5'),
(2, [], 'latest6'),
(2, [], 'latest7'),
(2, [], 'latest8'),
(2, [], 'latest9'),
(2, [], 'latest10'),
(2, [], 'latest13'),
(2, [], 'latest14'),
(2, [], 'latest15'),
(2, [], 'latest16'),
(2, [], 'latest17'),
(2, [], 'latest18'),])
model.add_prototype_permission(org, 'read', activating_user=new_user_1,
delegate_user=new_user_2)
model.add_prototype_permission(org, 'read', activating_user=new_user_1,