Change derived storage to be based on image

Fixes #971
This commit is contained in:
Joseph Schorr 2015-11-24 12:44:07 -05:00
parent 8d05d40cf7
commit 762cd56e64
10 changed files with 155 additions and 112 deletions

Binary file not shown.

View file

@ -56,6 +56,6 @@ up_postgres
echo '> Running Full Test Suite (postgres)'
set +e
run_tests "postgresql://postgres@127.0.0.1/genschema"
run_tests "postgresql://postgres@192.168.99.100/genschema"
set -e
down_postgres

View file

@ -1568,9 +1568,9 @@ class TestDeleteRepository(ApiTestCase):
# Create some repository action count entries.
RepositoryActionCount.create(repository=repository, date=datetime.datetime.now(), count=1)
RepositoryActionCount.create(repository=repository,
date=datetime.datetime.now() - datetime.timedelta(days=1), count=2)
date=datetime.datetime.now() - datetime.timedelta(days=2), count=2)
RepositoryActionCount.create(repository=repository,
date=datetime.datetime.now() - datetime.timedelta(days=3), count=6)
date=datetime.datetime.now() - datetime.timedelta(days=5), count=6)
# Delete the repository.
self.deleteResponse(Repository, params=dict(repository=self.COMPLEX_REPO))

View file

@ -40,8 +40,8 @@ class TestGarbageCollection(unittest.TestCase):
image.storage.save()
# Create derived images as well.
for i in range(0, 2):
model.storage.find_or_create_derived_storage(image.storage, 'squash', preferred)
model.image.find_or_create_derived_storage(image, 'squash', preferred)
model.image.find_or_create_derived_storage(image, 'aci', preferred)
# Add some additional placements to the image.
for location_name in ['local_eu']: