summaryrefslogtreecommitdiff
path: root/tests/functional
diff options
context:
space:
mode:
Diffstat (limited to 'tests/functional')
-rw-r--r--tests/functional/api/test_gitlab.py4
-rw-r--r--tests/functional/api/test_keys.py2
-rw-r--r--tests/functional/api/test_projects.py2
-rw-r--r--tests/functional/api/test_repository.py4
-rwxr-xr-xtests/functional/ee-test.py2
5 files changed, 6 insertions, 8 deletions
diff --git a/tests/functional/api/test_gitlab.py b/tests/functional/api/test_gitlab.py
index 7a70a56..e79492f 100644
--- a/tests/functional/api/test_gitlab.py
+++ b/tests/functional/api/test_gitlab.py
@@ -166,13 +166,13 @@ def test_rate_limits(gl):
projects = list()
for i in range(0, 20):
- projects.append(gl.projects.create({"name": str(i) + "ok"}))
+ projects.append(gl.projects.create({"name": f"{str(i)}ok"}))
with pytest.raises(gitlab.GitlabCreateError) as e:
for i in range(20, 40):
projects.append(
gl.projects.create(
- {"name": str(i) + "shouldfail"}, obey_rate_limit=False
+ {"name": f"{str(i)}shouldfail"}, obey_rate_limit=False
)
)
diff --git a/tests/functional/api/test_keys.py b/tests/functional/api/test_keys.py
index 82a75e5..4f2f4ed 100644
--- a/tests/functional/api/test_keys.py
+++ b/tests/functional/api/test_keys.py
@@ -10,7 +10,7 @@ def key_fingerprint(key):
key_part = key.split()[1]
decoded = base64.b64decode(key_part.encode("ascii"))
digest = hashlib.sha256(decoded).digest()
- return "SHA256:" + base64.b64encode(digest).rstrip(b"=").decode("utf-8")
+ return f"SHA256:{base64.b64encode(digest).rstrip(b'=').decode('utf-8')}"
def test_keys_ssh(gl, user, SSH_KEY):
diff --git a/tests/functional/api/test_projects.py b/tests/functional/api/test_projects.py
index 0572276..3a317d5 100644
--- a/tests/functional/api/test_projects.py
+++ b/tests/functional/api/test_projects.py
@@ -108,7 +108,7 @@ def test_project_file_uploads(project):
uploaded_file = project.upload(filename, file_contents)
assert uploaded_file["alt"] == filename
assert uploaded_file["url"].startswith("/uploads/")
- assert uploaded_file["url"].endswith("/" + filename)
+ assert uploaded_file["url"].endswith(f"/{filename}")
assert uploaded_file["markdown"] == "[{}]({})".format(
uploaded_file["alt"], uploaded_file["url"]
)
diff --git a/tests/functional/api/test_repository.py b/tests/functional/api/test_repository.py
index fe43862..06d4297 100644
--- a/tests/functional/api/test_repository.py
+++ b/tests/functional/api/test_repository.py
@@ -116,9 +116,7 @@ def test_revert_commit(project):
commit = project.commits.list()[0]
revert_commit = commit.revert(branch="main")
- expected_message = 'Revert "{}"\n\nThis reverts commit {}'.format(
- commit.message, commit.id
- )
+ expected_message = f'Revert "{commit.message}"\n\nThis reverts commit {commit.id}'
assert revert_commit["message"] == expected_message
with pytest.raises(gitlab.GitlabRevertError):
diff --git a/tests/functional/ee-test.py b/tests/functional/ee-test.py
index 3a99951..a356c80 100755
--- a/tests/functional/ee-test.py
+++ b/tests/functional/ee-test.py
@@ -14,7 +14,7 @@ LDAP_PROVIDER = "ldapmain"
def start_log(message):
- print("Testing %s... " % message, end="")
+ print(f"Testing {message}... ", end="")
def end_log():