Commit 4bef4730 authored by Tim Knight's avatar Tim Knight ☕ Committed by Nejc Habjan
Browse files

test: update api tests for GL 16.10 



- Make sure we're testing python-gitlab functionality,
make sure we're not awaiting on Gitlab Async functions
- Decouple and improve test stability

Signed-off-by: default avatarTim Knight <tim.knight1@engineering.digital.dwp.gov.uk>
parent b81da2e6

tests/functional/api/test_boards.py

+0 −2
Original line number Diff line number Diff line
@@ -5,7 +5,6 @@ def test_project_boards(project): 
    board = project.boards.get(board.id)



    project.boards.delete(board.id)

    assert not project.boards.list()





def test_group_boards(group):
@@ -15,4 +14,3 @@ def test_group_boards(group): 
    board = group.boards.get(board.id)



    group.boards.delete(board.id)
 
    assert not group.boards.list()

tests/functional/api/test_bulk_imports.py

+4 −1
Original line number Diff line number Diff line 
import time



import pytest



import gitlab
@@ -15,7 +16,7 @@ def bulk_import_enabled(gl: gitlab.Gitlab): 
    # todo: why so fussy with feature flag timing?

    time.sleep(5)

    get_settings = gl.settings.get()

    assert get_settings.bulk_import_enabled == True

    assert get_settings.bulk_import_enabled is True



    yield settings
@@ -23,6 +24,8 @@ def bulk_import_enabled(gl: gitlab.Gitlab): 
    settings.save()





# https://github.com/python-gitlab/python-gitlab/pull/2790#pullrequestreview-1873617123

@pytest.mark.xfail(reason="Bulk Imports to be worked on in a follow up")

def test_bulk_imports(gl, group, bulk_import_enabled):

    destination = f"{group.full_path}-import"

    configuration = {

tests/functional/api/test_current_user.py

+1 −3
Original line number Diff line number Diff line
@@ -4,7 +4,6 @@ def test_current_user_email(gl): 
    assert mail in gl.user.emails.list()



    mail.delete()

    assert mail not in gl.user.emails.list()





def test_current_user_gpg_keys(gl, GPG_KEY):
@@ -14,8 +13,8 @@ def test_current_user_gpg_keys(gl, GPG_KEY): 


    # Seems broken on the gitlab side

    gkey = gl.user.gpgkeys.get(gkey.id)



    gkey.delete()

    assert gkey not in gl.user.gpgkeys.list()





def test_current_user_ssh_keys(gl, SSH_KEY):
@@ -24,7 +23,6 @@ def test_current_user_ssh_keys(gl, SSH_KEY): 
    assert key in gl.user.keys.list()



    key.delete()

    assert key not in gl.user.keys.list()





def test_current_user_status(gl):

tests/functional/api/test_deploy_keys.py

+1 −1
Original line number Diff line number Diff line
@@ -7,5 +7,5 @@ def test_project_deploy_keys(gl, project, DEPLOY_KEY): 
    assert deploy_key in project2.keys.list()



    project2.keys.delete(deploy_key.id)

    assert deploy_key not in project2.keys.list()



    project2.delete()

tests/functional/api/test_deploy_tokens.py

+2 −6
Original line number Diff line number Diff line 
from datetime import date

import datetime





def test_project_deploy_tokens(gl, project):

    today = date.today().isoformat()

    today = datetime.date.today().isoformat()

    deploy_token = project.deploytokens.create(

        {

            "name": "foo",
@@ -21,8 +21,6 @@ def test_project_deploy_tokens(gl, project): 
    assert deploy_token.username == "bar"



    deploy_token.delete()

    assert deploy_token not in project.deploytokens.list()

    assert deploy_token not in gl.deploytokens.list()





def test_group_deploy_tokens(gl, group):
@@ -41,5 +39,3 @@ def test_group_deploy_tokens(gl, group): 
    assert deploy_token.scopes == ["read_registry"]



    deploy_token.delete()
 
    assert deploy_token not in group.deploytokens.list()

    assert deploy_token not in gl.deploytokens.list()