From ccca0c9655644ea786b616ad2b312d9039b36d36 Mon Sep 17 00:00:00 2001 From: EvB Date: Fri, 7 Jul 2017 13:44:35 -0400 Subject: [PATCH] refactor(util/tufmetadata/test): move app test to gc suite --- data/model/test/test_gc.py | 7 +++++++ util/tufmetadata/test/test_tufmetadata.py | 12 +----------- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/data/model/test/test_gc.py b/data/model/test/test_gc.py index 2c1626c30..975de1660 100644 --- a/data/model/test/test_gc.py +++ b/data/model/test/test_gc.py @@ -613,3 +613,10 @@ def test_images_shared_cas_with_new_blob_table(default_tag_policy, initialized_d # Ensure the CAS path still exists, as it is referenced by the Blob table assert storage.exists({preferred}, storage.blob_path(digest)) + + +def test_purge_repo(app): + """ Test that app registers delete_metadata function on repository deletions """ + with patch('app.tuf_metadata_api') as mock_tuf: + model.repository.purge_repository("ns", "repo") + assert mock_tuf.delete_metadata.called_with("ns", "repo") diff --git a/util/tufmetadata/test/test_tufmetadata.py b/util/tufmetadata/test/test_tufmetadata.py index 27255c795..faeb409a2 100644 --- a/util/tufmetadata/test/test_tufmetadata.py +++ b/util/tufmetadata/test/test_tufmetadata.py @@ -6,8 +6,7 @@ from flask import Flask from test import testconfig from test.fixtures import init_db_path -from util.tufmetadata import api -from data import model +from util.tufmetadata import api valid_response = { @@ -247,12 +246,3 @@ def test_delete_metadata_exception(response_code, exception): tuf_api = api.TUFMetadataAPI(app, app.config, client=client) response = tuf_api.delete_metadata('quay', 'quay') assert response == False - - -def test_purge_repo(init_db_path): - app = Flask(__name__) - app.config.from_object(testconfig.TestConfig()) - app.config["DB_URI"] = init_db_path - with patch('app.tuf_metadata_api') as mock_tuf: - model.repository.purge_repository("ns", "repo") - assert mock_tuf.delete_metadata.called_with("ns", "repo") \ No newline at end of file