From 400b346953879e97d2eb1d35837aa874e6763171 Mon Sep 17 00:00:00 2001 From: Charlton Austin Date: Tue, 27 Jun 2017 17:07:20 -0400 Subject: [PATCH] test(endpoints/api): add in test for tag this adds tests for the pro oci model Issue: https://coreosdev.atlassian.net/browse/QUAY-632 - [ ] It works! - [ ] Comments provide sufficient explanations for the next contributor - [ ] Tests cover changes and corner cases - [ ] Follows Quay syntax patterns and format --- endpoints/api/tag.py | 2 +- endpoints/api/tag_interface/__init__.py | 0 endpoints/api/tag_interface/test/__init__.py | 0 ...s_interface.py => tag_models_interface.py} | 0 ...odels_pre_oci.py => tag_models_pre_oci.py} | 2 +- .../test/test_models_pre_oci.py | 5 +- endpoints/api/test/test_tag.py | 91 ++++++++++++++++++- 7 files changed, 90 insertions(+), 10 deletions(-) delete mode 100644 endpoints/api/tag_interface/__init__.py delete mode 100644 endpoints/api/tag_interface/test/__init__.py rename endpoints/api/{tag_interface/models_interface.py => tag_models_interface.py} (100%) rename endpoints/api/{tag_interface/models_pre_oci.py => tag_models_pre_oci.py} (92%) rename endpoints/api/{tag_interface => }/test/test_models_pre_oci.py (96%) diff --git a/endpoints/api/tag.py b/endpoints/api/tag.py index 7563e6c15..1422b2971 100644 --- a/endpoints/api/tag.py +++ b/endpoints/api/tag.py @@ -8,7 +8,7 @@ from endpoints.api import (resource, nickname, require_repo_read, require_repo_w RepositoryParamResource, log_action, validate_json_request, path_param, parse_args, query_param, truthy_bool, disallow_for_app_repositories) from endpoints.api.image import image_view -from endpoints.api.tag_interface.models_pre_oci import pre_oci_model +from endpoints.api.tag_models_pre_oci import pre_oci_model from endpoints.exception import NotFound from endpoints.v2.manifest import _generate_and_store_manifest from util.names import TAG_ERROR, TAG_REGEX diff --git a/endpoints/api/tag_interface/__init__.py b/endpoints/api/tag_interface/__init__.py deleted file mode 100644 index e69de29bb..000000000 diff --git a/endpoints/api/tag_interface/test/__init__.py b/endpoints/api/tag_interface/test/__init__.py deleted file mode 100644 index e69de29bb..000000000 diff --git a/endpoints/api/tag_interface/models_interface.py b/endpoints/api/tag_models_interface.py similarity index 100% rename from endpoints/api/tag_interface/models_interface.py rename to endpoints/api/tag_models_interface.py diff --git a/endpoints/api/tag_interface/models_pre_oci.py b/endpoints/api/tag_models_pre_oci.py similarity index 92% rename from endpoints/api/tag_interface/models_pre_oci.py rename to endpoints/api/tag_models_pre_oci.py index 995b69de0..a1842b036 100644 --- a/endpoints/api/tag_interface/models_pre_oci.py +++ b/endpoints/api/tag_models_pre_oci.py @@ -1,5 +1,5 @@ from data import model -from endpoints.api.tag_interface.models_interface import TagDataInterface, Tag, RepositoryTagHistory +from endpoints.api.tag_models_interface import TagDataInterface, Tag, RepositoryTagHistory class PreOCIModel(TagDataInterface): diff --git a/endpoints/api/tag_interface/test/test_models_pre_oci.py b/endpoints/api/test/test_models_pre_oci.py similarity index 96% rename from endpoints/api/tag_interface/test/test_models_pre_oci.py rename to endpoints/api/test/test_models_pre_oci.py index 1df367dd1..7481511a0 100644 --- a/endpoints/api/tag_interface/test/test_models_pre_oci.py +++ b/endpoints/api/test/test_models_pre_oci.py @@ -1,10 +1,9 @@ import pytest -from data.model.tag_interface.models_interface import RepositoryTagHistory, Tag +from endpoints.api.tag_models_interface import RepositoryTagHistory, Tag from mock import Mock from data import model -from endpoints.api.tag_interface.models_pre_oci import pre_oci_model - +from endpoints.api.tag_models_pre_oci import pre_oci_model EMPTY_REPOSITORY = 'empty_repository' EMPTY_NAMESPACE = 'empty_namespace' diff --git a/endpoints/api/test/test_tag.py b/endpoints/api/test/test_tag.py index 0c80ef4ee..b2425c3ad 100644 --- a/endpoints/api/test/test_tag.py +++ b/endpoints/api/test/test_tag.py @@ -1,9 +1,12 @@ +import json + import pytest -from mock import patch, Mock +from mock import patch, Mock, MagicMock, call +from endpoints.api.tag_models_interface import RepositoryTagHistory, Tag from endpoints.api.test.shared import client_with_identity, conduct_api_call -from endpoints.api.tag import RepositoryTag, RestoreTag +from endpoints.api.tag import RepositoryTag, RestoreTag, ListRepositoryTags from features import FeatureNameValue from test.fixtures import * @@ -80,6 +83,28 @@ def authd_client(client): yield cl +@pytest.fixture() +def list_repository_tag_history(): + def list_repository_tag_history(namespace_name, repository_name, page, size, specific_tag): + return RepositoryTagHistory(tags=[ + Tag(name='First Tag', image='image', reversion=False, lifetime_start_ts=0, lifetime_end_ts=0, manifest_list=[], + docker_image_id='first docker image id'), + Tag(name='Second Tag', image='second image', reversion=True, lifetime_start_ts=10, lifetime_end_ts=100, + manifest_list=[], docker_image_id='second docker image id')], more=False) + + with patch('endpoints.api.tag.pre_oci_model.list_repository_tag_history', side_effect=list_repository_tag_history): + yield + + +@pytest.fixture() +def find_no_repo_tag_history(): + def list_repository_tag_history(namespace_name, repository_name, page, size, specific_tag): + return None + + with patch('endpoints.api.tag.pre_oci_model.list_repository_tag_history', side_effect=list_repository_tag_history): + yield + + @pytest.mark.parametrize('test_image,test_tag,expected_status', [ ('image1', '-INVALID-TAG-NAME', 400), ('image1', '.INVALID-TAG-NAME', 400), @@ -93,7 +118,7 @@ def authd_client(client): ]) def test_move_tag(test_image, test_tag, expected_status, get_repo_image, get_repo_tag_image, create_or_update_tag, generate_manifest, authd_client): - params = {'repository': 'devtable/repo', 'tag': test_tag} + params = {'repository': 'devtable/simple', 'tag': test_tag} request_body = {'image': test_image} if expected_status is None: with pytest.raises(Exception): @@ -102,6 +127,62 @@ def test_move_tag(test_image, test_tag, expected_status, get_repo_image, get_rep conduct_api_call(authd_client, RepositoryTag, 'put', params, request_body, expected_status) +@pytest.mark.parametrize('namespace, repository, specific_tag, page, limit, expected_response_code, expected', [ + ('devtable', 'simple', None, 1, 10, 200, {'has_additional': False}), + ('devtable', 'simple', None, 1, 10, 200, {'page': 1}), + ('devtable', 'simple', None, 1, 10, 200, {'tags': [{'docker_image_id': 'first docker image id', + 'name': 'First Tag', + 'reversion': False}, + {'docker_image_id': 'second docker image id', + 'end_ts': 100, + 'name': 'Second Tag', + 'reversion': True, + 'start_ts': 10}]}), +]) +def test_list_repository_tags_view_is_correct(namespace, repository, specific_tag, page, limit, + list_repository_tag_history, expected_response_code, expected, + authd_client): + params = {'repository': namespace + '/' + repository, 'specificTag': specific_tag, 'page': page, 'limit': limit} + response = conduct_api_call(authd_client, ListRepositoryTags, 'get', params, expected_code=expected_response_code) + compare_list_history_tags_response(expected, response.json) + + +def compare_list_history_tags_response(expected, actual): + if 'has_additional' in expected: + assert expected['has_additional'] == actual['has_additional'] + + if 'page' in expected: + assert expected['page'] == actual['page'] + + if 'tags' in expected: + assert expected['tags'] == actual['tags'] + + +def test_no_repo_tag_history(find_no_repo_tag_history, authd_client): + params = {'repository': 'devtable/simple', 'specificTag': None, 'page': 1, 'limit': 10} + conduct_api_call(authd_client, ListRepositoryTags, 'get', params, expected_code=404) + + +@pytest.mark.parametrize( + 'specific_tag, page, limit, expected_specific_tag, expected_page, expected_limit', [ + (None, None, None, None, 1, 50), + ('specific_tag', 12, 13, 'specific_tag', 12, 13), + ('specific_tag', -1, 101, 'specific_tag', 1, 100), + ('specific_tag', 0, 0, 'specific_tag', 1, 1), + ]) +def test_repo_tag_history_param_parse(specific_tag, page, limit, expected_specific_tag, expected_page, expected_limit, + authd_client): + mock = MagicMock() + mock.return_value = RepositoryTagHistory(tags=[], more=False) + + with patch('endpoints.api.tag.pre_oci_model.list_repository_tag_history', side_effect=mock): + params = {'repository': 'devtable/simple', 'specificTag': specific_tag, 'page': page, 'limit': limit} + conduct_api_call(authd_client, ListRepositoryTags, 'get', params) + + assert mock.call_args == call(namespace_name='devtable', repository_name='simple', + page=expected_page, size=expected_limit, specific_tag=expected_specific_tag) + + @pytest.mark.parametrize('test_manifest,test_tag,manifest_generated,expected_status', [ (None, 'newtag', True, 200), (None, 'generatemanifestfail', True, None), @@ -110,7 +191,7 @@ def test_move_tag(test_image, test_tag, expected_status, get_repo_image, get_rep def test_restore_tag(test_manifest, test_tag, manifest_generated, expected_status, get_repository, restore_tag_to_manifest, restore_tag_to_image, generate_manifest, authd_client): - params = {'repository': 'devtable/repo', 'tag': test_tag} + params = {'repository': 'devtable/simple', 'tag': test_tag} request_body = {'image': 'image1'} if test_manifest is not None: request_body['manifest_digest'] = test_manifest @@ -121,4 +202,4 @@ def test_restore_tag(test_manifest, test_tag, manifest_generated, expected_statu conduct_api_call(authd_client, RestoreTag, 'post', params, request_body, expected_status) if manifest_generated: - generate_manifest.assert_called_with('devtable', 'repo', test_tag) + generate_manifest.assert_called_with('devtable', 'simple', test_tag)