From b6d26e68fb6cc098d70fc685ce92586e0f575f83 Mon Sep 17 00:00:00 2001 From: Chih-Hsuan Yen Date: Fri, 29 Nov 2019 22:42:08 +0800 Subject: [PATCH] Fix gitlab tests The repo https://gitlab.com/gitlab-org/gitlab-test gets a new tag v1.1.1, which is for testing a new GitLab feature [1][2]. [1] https://gitlab.com/gitlab-org/gitlab/merge_requests/17773 [2] https://gitlab.com/gitlab-org/gitlab-test/merge_requests/40 --- tests/test_gitlab.py | 6 +++--- tests/test_gitlab_local.py | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/test_gitlab.py b/tests/test_gitlab.py index f593c28..aa8cc3b 100644 --- a/tests/test_gitlab.py +++ b/tests/test_gitlab.py @@ -15,10 +15,10 @@ async def test_gitlab(get_version): assert ver.isdigit() async def test_gitlab_max_tag(get_version): - assert await get_version("example", {"gitlab": "gitlab-org/gitlab-test", "use_max_tag": 1}) == "v1.1.0" + assert await get_version("example", {"gitlab": "gitlab-org/gitlab-test", "use_max_tag": 1}) == "v1.1.1" async def test_gitlab_max_tag_with_ignored_tags(get_version): - assert await get_version("example", {"gitlab": "gitlab-org/gitlab-test", "use_max_tag": 1, "ignored_tags": "v1.1.0"}) == "v1.0.0" + assert await get_version("example", {"gitlab": "gitlab-org/gitlab-test", "use_max_tag": 1, "ignored_tags": "v1.1.0 v1.1.1"}) == "v1.0.0" async def test_gitlab_max_tag_with_include(get_version): assert await get_version("example", { @@ -29,6 +29,6 @@ async def test_gitlab_max_tag_with_include(get_version): async def test_gitlab_max_tag_with_ignored(get_version): assert await get_version("example", { "gitlab": "gitlab-org/gitlab-test", "use_max_tag": 1, - "ignored": "v1.1.0", + "ignored": "v1.1.0 v1.1.1", }) == "v1.0.0" diff --git a/tests/test_gitlab_local.py b/tests/test_gitlab_local.py index d39dc5f..53f4e96 100644 --- a/tests/test_gitlab_local.py +++ b/tests/test_gitlab_local.py @@ -29,11 +29,11 @@ async def test_gitlab(get_version): async def test_gitlab_max_tag(get_version): with unset_gitlab_token_env(): - assert await get_version("example", {"gitlab": "gitlab-org/gitlab-test", "use_max_tag": 1}) == "v1.1.0" + assert await get_version("example", {"gitlab": "gitlab-org/gitlab-test", "use_max_tag": 1}) == "v1.1.1" async def test_gitlab_max_tag_with_ignored_tags(get_version): with unset_gitlab_token_env(): ver = await get_version("example", - {"gitlab": "gitlab-org/gitlab-test", "use_max_tag": 1, "ignored_tags": "v1.1.0"}) + {"gitlab": "gitlab-org/gitlab-test", "use_max_tag": 1, "ignored_tags": "v1.1.0 v1.1.1"}) assert ver == "v1.0.0"