Accidental refactor, split out legacy.py into separate sumodules and update all call sites.
This commit is contained in:
parent
2109d24483
commit
3efaa255e8
92 changed files with 4458 additions and 4269 deletions
|
@ -13,8 +13,8 @@ REPO = 'somerepo'
|
|||
class TestGarbageColection(unittest.TestCase):
|
||||
@staticmethod
|
||||
def _set_tag_expiration_policy(namespace, expiration_s):
|
||||
namespace_user = model.get_user(namespace)
|
||||
model.change_user_tag_expiration(namespace_user, expiration_s)
|
||||
namespace_user = model.user.get_user(namespace)
|
||||
model.user.change_user_tag_expiration(namespace_user, expiration_s)
|
||||
|
||||
def setUp(self):
|
||||
setup_database_for_testing(self)
|
||||
|
@ -32,14 +32,14 @@ class TestGarbageColection(unittest.TestCase):
|
|||
|
||||
def createImage(self, docker_image_id, repository_obj, username):
|
||||
preferred = storage.preferred_locations[0]
|
||||
image = model.find_create_or_link_image(docker_image_id, repository_obj, username, {},
|
||||
preferred)
|
||||
image = model.image.find_create_or_link_image(docker_image_id, repository_obj, username, {},
|
||||
preferred)
|
||||
image.storage.uploading = False
|
||||
image.storage.save()
|
||||
|
||||
# Create derived images as well.
|
||||
for i in range(0, 2):
|
||||
model.find_or_create_derived_storage(image.storage, 'squash', preferred)
|
||||
model.storage.find_or_create_derived_storage(image.storage, 'squash', preferred)
|
||||
|
||||
# Add some additional placements to the image.
|
||||
for location_name in ['local_eu']:
|
||||
|
@ -55,8 +55,8 @@ class TestGarbageColection(unittest.TestCase):
|
|||
return image.storage
|
||||
|
||||
def createRepository(self, namespace=ADMIN_ACCESS_USER, name=REPO, **kwargs):
|
||||
user = model.get_user(namespace)
|
||||
repo = model.create_repository(namespace, name, user)
|
||||
user = model.user.get_user(namespace)
|
||||
repo = model.repository.create_repository(namespace, name, user)
|
||||
|
||||
# Populate the repository with the tags.
|
||||
image_map = {}
|
||||
|
@ -69,35 +69,37 @@ class TestGarbageColection(unittest.TestCase):
|
|||
image_map[image_id] = self.createImage(image_id, repo, namespace)
|
||||
|
||||
# Set the ancestors for the image.
|
||||
parent = model.set_image_metadata(image_id, namespace, name, '', '', '', parent=parent)
|
||||
parent = model.image.set_image_metadata(image_id, namespace, name, '', '', '',
|
||||
parent=parent)
|
||||
|
||||
# Set the tag for the image.
|
||||
model.create_or_update_tag(namespace, name, tag_name, image_ids[-1])
|
||||
model.tag.create_or_update_tag(namespace, name, tag_name, image_ids[-1])
|
||||
|
||||
return repo
|
||||
|
||||
def gcNow(self, repository):
|
||||
model.garbage_collect_repository(repository.namespace_user.username, repository.name)
|
||||
model.repository.garbage_collect_repository(repository.namespace_user.username, repository.name)
|
||||
|
||||
def deleteTag(self, repository, tag):
|
||||
model.delete_tag(repository.namespace_user.username, repository.name, tag)
|
||||
model.garbage_collect_repository(repository.namespace_user.username, repository.name)
|
||||
model.tag.delete_tag(repository.namespace_user.username, repository.name, tag)
|
||||
model.repository.garbage_collect_repository(repository.namespace_user.username, repository.name)
|
||||
|
||||
def moveTag(self, repository, tag, docker_image_id):
|
||||
model.create_or_update_tag(repository.namespace_user.username, repository.name, tag,
|
||||
model.tag.create_or_update_tag(repository.namespace_user.username, repository.name, tag,
|
||||
docker_image_id)
|
||||
model.garbage_collect_repository(repository.namespace_user.username, repository.name)
|
||||
model.repository.garbage_collect_repository(repository.namespace_user.username, repository.name)
|
||||
|
||||
def assertNotDeleted(self, repository, *args):
|
||||
for docker_image_id in args:
|
||||
self.assertTrue(bool(model.get_image_by_id(repository.namespace_user.username,
|
||||
repository.name, docker_image_id)))
|
||||
self.assertTrue(bool(model.image.get_image_by_id(repository.namespace_user.username,
|
||||
repository.name, docker_image_id)))
|
||||
|
||||
def assertDeleted(self, repository, *args):
|
||||
for docker_image_id in args:
|
||||
try:
|
||||
# Verify the image is missing when accessed by the repository.
|
||||
model.get_image_by_id(repository.namespace_user.username, repository.name, docker_image_id)
|
||||
model.image.get_image_by_id(repository.namespace_user.username, repository.name,
|
||||
docker_image_id)
|
||||
except model.DataModelException:
|
||||
return
|
||||
|
||||
|
|
Reference in a new issue