summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorNejc Habjan <hab.nejc@gmail.com>2021-10-09 15:35:32 +0200
committerNejc Habjan <hab.nejc@gmail.com>2021-10-11 22:49:46 +0200
commit545f8ed24124837bf4e55aa34e185270a4b7aeff (patch)
treeadad76b598b917d9ca77ed600dcd62c63af67950 /tests
parent5a1678f43184bd459132102cc13cf8426fe0449d (diff)
downloadgitlab-545f8ed24124837bf4e55aa34e185270a4b7aeff.tar.gz
chore: rename `master` branch to `main`chore/master-to-main
BREAKING CHANGE: As of python-gitlab 3.0.0, the default branch for development has changed from `master` to `main`.
Diffstat (limited to 'tests')
-rw-r--r--tests/functional/api/test_merge_requests.py6
-rw-r--r--tests/functional/api/test_projects.py2
-rw-r--r--tests/functional/api/test_repository.py22
-rw-r--r--tests/functional/cli/test_cli_artifacts.py2
-rw-r--r--tests/functional/cli/test_cli_v4.py8
-rw-r--r--tests/functional/conftest.py2
-rw-r--r--tests/unit/objects/test_badges.py4
-rw-r--r--tests/unit/objects/test_bridges.py6
-rw-r--r--tests/unit/objects/test_commits.py4
-rw-r--r--tests/unit/objects/test_deployments.py6
-rw-r--r--tests/unit/objects/test_job_artifacts.py2
-rw-r--r--tests/unit/objects/test_jobs.py8
-rw-r--r--tests/unit/objects/test_merge_request_pipelines.py2
-rw-r--r--tests/unit/objects/test_pipeline_schedules.py4
-rw-r--r--tests/unit/objects/test_pipelines.py8
-rw-r--r--tests/unit/objects/test_project_merge_request_approvals.py2
-rw-r--r--tests/unit/objects/test_runners.py2
-rw-r--r--tests/unit/objects/test_submodules.py2
18 files changed, 46 insertions, 46 deletions
diff --git a/tests/functional/api/test_merge_requests.py b/tests/functional/api/test_merge_requests.py
index b20b66a..a814572 100644
--- a/tests/functional/api/test_merge_requests.py
+++ b/tests/functional/api/test_merge_requests.py
@@ -10,14 +10,14 @@ def test_merge_requests(project):
project.files.create(
{
"file_path": "README.rst",
- "branch": "master",
+ "branch": "main",
"content": "Initial content",
"commit_message": "Initial commit",
}
)
source_branch = "branch1"
- project.branches.create({"branch": source_branch, "ref": "master"})
+ project.branches.create({"branch": source_branch, "ref": "main"})
project.files.create(
{
@@ -28,7 +28,7 @@ def test_merge_requests(project):
}
)
project.mergerequests.create(
- {"source_branch": "branch1", "target_branch": "master", "title": "MR readme2"}
+ {"source_branch": "branch1", "target_branch": "main", "title": "MR readme2"}
)
diff --git a/tests/functional/api/test_projects.py b/tests/functional/api/test_projects.py
index 88b274c..ba8e25b 100644
--- a/tests/functional/api/test_projects.py
+++ b/tests/functional/api/test_projects.py
@@ -240,7 +240,7 @@ def test_project_stars(project):
def test_project_tags(project, project_file):
- tag = project.tags.create({"tag_name": "v1.0", "ref": "master"})
+ tag = project.tags.create({"tag_name": "v1.0", "ref": "main"})
assert len(project.tags.list()) == 1
tag.delete()
diff --git a/tests/functional/api/test_repository.py b/tests/functional/api/test_repository.py
index 7ba84ea..fe43862 100644
--- a/tests/functional/api/test_repository.py
+++ b/tests/functional/api/test_repository.py
@@ -10,32 +10,32 @@ def test_repository_files(project):
project.files.create(
{
"file_path": "README",
- "branch": "master",
+ "branch": "main",
"content": "Initial content",
"commit_message": "Initial commit",
}
)
- readme = project.files.get(file_path="README", ref="master")
+ readme = project.files.get(file_path="README", ref="main")
readme.content = base64.b64encode(b"Improved README").decode()
time.sleep(2)
- readme.save(branch="master", commit_message="new commit")
- readme.delete(commit_message="Removing README", branch="master")
+ readme.save(branch="main", commit_message="new commit")
+ readme.delete(commit_message="Removing README", branch="main")
project.files.create(
{
"file_path": "README.rst",
- "branch": "master",
+ "branch": "main",
"content": "Initial content",
"commit_message": "New commit",
}
)
- readme = project.files.get(file_path="README.rst", ref="master")
+ readme = project.files.get(file_path="README.rst", ref="main")
# The first decode() is the ProjectFile method, the second one is the bytes
# object method
assert readme.decode().decode() == "Initial content"
- blame = project.files.blame(file_path="README.rst", ref="master")
+ blame = project.files.blame(file_path="README.rst", ref="main")
assert blame
@@ -51,7 +51,7 @@ def test_repository_tree(project):
archive = project.repository_archive()
assert isinstance(archive, bytes)
- archive2 = project.repository_archive("master")
+ archive2 = project.repository_archive("main")
assert archive == archive2
snapshot = project.snapshot()
@@ -60,7 +60,7 @@ def test_repository_tree(project):
def test_create_commit(project):
data = {
- "branch": "master",
+ "branch": "main",
"commit_message": "blah blah blah",
"actions": [{"action": "create", "file_path": "blah", "content": "blah"}],
}
@@ -114,7 +114,7 @@ def test_commit_discussion(project):
def test_revert_commit(project):
commit = project.commits.list()[0]
- revert_commit = commit.revert(branch="master")
+ revert_commit = commit.revert(branch="main")
expected_message = 'Revert "{}"\n\nThis reverts commit {}'.format(
commit.message, commit.id
@@ -123,4 +123,4 @@ def test_revert_commit(project):
with pytest.raises(gitlab.GitlabRevertError):
# Two revert attempts should raise GitlabRevertError
- commit.revert(branch="master")
+ commit.revert(branch="main")
diff --git a/tests/functional/cli/test_cli_artifacts.py b/tests/functional/cli/test_cli_artifacts.py
index aab0546..76eb9f2 100644
--- a/tests/functional/cli/test_cli_artifacts.py
+++ b/tests/functional/cli/test_cli_artifacts.py
@@ -14,7 +14,7 @@ content = textwrap.dedent(
)
data = {
"file_path": ".gitlab-ci.yml",
- "branch": "master",
+ "branch": "main",
"content": content,
"commit_message": "Initial commit",
}
diff --git a/tests/functional/cli/test_cli_v4.py b/tests/functional/cli/test_cli_v4.py
index a63c1b1..91c0afa 100644
--- a/tests/functional/cli/test_cli_v4.py
+++ b/tests/functional/cli/test_cli_v4.py
@@ -125,7 +125,7 @@ def test_list_user_memberships(gitlab_cli, user):
def test_project_create_file(gitlab_cli, project):
file_path = "README"
- branch = "master"
+ branch = "main"
content = "CONTENT"
commit_message = "Initial commit"
@@ -197,7 +197,7 @@ def test_create_branch(gitlab_cli, project):
"--branch",
branch,
"--ref",
- "master",
+ "main",
]
ret = gitlab_cli(cmd)
@@ -215,7 +215,7 @@ def test_create_merge_request(gitlab_cli, project):
"--source-branch",
branch,
"--target-branch",
- "master",
+ "main",
"--title",
"Update README",
]
@@ -260,7 +260,7 @@ def test_revert_commit(gitlab_cli, project):
"--id",
commit.id,
"--branch",
- "master",
+ "main",
]
ret = gitlab_cli(cmd)
diff --git a/tests/functional/conftest.py b/tests/functional/conftest.py
index 23aa583..b6fb9ed 100644
--- a/tests/functional/conftest.py
+++ b/tests/functional/conftest.py
@@ -305,7 +305,7 @@ def project_file(project):
project_file = project.files.create(
{
"file_path": "README",
- "branch": "master",
+ "branch": "main",
"content": "Initial content",
"commit_message": "Initial commit",
}
diff --git a/tests/unit/objects/test_badges.py b/tests/unit/objects/test_badges.py
index e226684..d488627 100644
--- a/tests/unit/objects/test_badges.py
+++ b/tests/unit/objects/test_badges.py
@@ -10,12 +10,12 @@ import responses
from gitlab.v4.objects import GroupBadge, ProjectBadge
link_url = (
- "http://example.com/ci_status.svg?project=example-org/example-project&ref=master"
+ "http://example.com/ci_status.svg?project=example-org/example-project&ref=main"
)
image_url = "https://example.io/my/badge"
rendered_link_url = (
- "http://example.com/ci_status.svg?project=example-org/example-project&ref=master"
+ "http://example.com/ci_status.svg?project=example-org/example-project&ref=main"
)
rendered_image_url = "https://example.io/my/badge"
diff --git a/tests/unit/objects/test_bridges.py b/tests/unit/objects/test_bridges.py
index 4d39186..5259b8c 100644
--- a/tests/unit/objects/test_bridges.py
+++ b/tests/unit/objects/test_bridges.py
@@ -28,14 +28,14 @@ def resp_list_bridges():
"name": "teaspoon",
"pipeline": {
"id": 6,
- "ref": "master",
+ "ref": "main",
"sha": "0ff3ae198f8601a285adcf5c0fff204ee6fba5fd",
"status": "pending",
"created_at": "2015-12-24T15:50:16.123Z",
"updated_at": "2015-12-24T18:00:44.432Z",
"web_url": "https://example.com/foo/bar/pipelines/6",
},
- "ref": "master",
+ "ref": "main",
"stage": "test",
"status": "pending",
"tag": False,
@@ -58,7 +58,7 @@ def resp_list_bridges():
"downstream_pipeline": {
"id": 5,
"sha": "f62a4b2fb89754372a346f24659212eb8da13601",
- "ref": "master",
+ "ref": "main",
"status": "pending",
"created_at": "2015-12-24T17:54:27.722Z",
"updated_at": "2015-12-24T17:58:27.896Z",
diff --git a/tests/unit/objects/test_commits.py b/tests/unit/objects/test_commits.py
index 6b98117..2e709b3 100644
--- a/tests/unit/objects/test_commits.py
+++ b/tests/unit/objects/test_commits.py
@@ -86,7 +86,7 @@ def test_get_commit(project, resp_commit):
def test_create_commit(project, resp_create_commit):
data = {
- "branch": "master",
+ "branch": "main",
"commit_message": "Commit message",
"actions": [
{
@@ -103,7 +103,7 @@ def test_create_commit(project, resp_create_commit):
def test_revert_commit(project, resp_commit):
commit = project.commits.get("6b2257ea", lazy=True)
- revert_commit = commit.revert(branch="master")
+ revert_commit = commit.revert(branch="main")
assert revert_commit["short_id"] == "8b090c1b"
assert revert_commit["title"] == 'Revert "Initial commit"'
diff --git a/tests/unit/objects/test_deployments.py b/tests/unit/objects/test_deployments.py
index 3cde8fe..92e33c2 100644
--- a/tests/unit/objects/test_deployments.py
+++ b/tests/unit/objects/test_deployments.py
@@ -7,7 +7,7 @@ import responses
@pytest.fixture
def resp_deployment():
- content = {"id": 42, "status": "success", "ref": "master"}
+ content = {"id": 42, "status": "success", "ref": "main"}
with responses.RequestsMock() as rsps:
rsps.add(
@@ -36,14 +36,14 @@ def test_deployment(project, resp_deployment):
{
"environment": "Test",
"sha": "1agf4gs",
- "ref": "master",
+ "ref": "main",
"tag": False,
"status": "created",
}
)
assert deployment.id == 42
assert deployment.status == "success"
- assert deployment.ref == "master"
+ assert deployment.ref == "main"
deployment.status = "failed"
deployment.save()
diff --git a/tests/unit/objects/test_job_artifacts.py b/tests/unit/objects/test_job_artifacts.py
index 7c5f1df..0d455fe 100644
--- a/tests/unit/objects/test_job_artifacts.py
+++ b/tests/unit/objects/test_job_artifacts.py
@@ -5,7 +5,7 @@ GitLab API: https://docs.gitlab.com/ee/api/job_artifacts.html
import pytest
import responses
-ref_name = "master"
+ref_name = "main"
job = "build"
diff --git a/tests/unit/objects/test_jobs.py b/tests/unit/objects/test_jobs.py
index 104d59d..9454f36 100644
--- a/tests/unit/objects/test_jobs.py
+++ b/tests/unit/objects/test_jobs.py
@@ -26,7 +26,7 @@ job_content = {
"id": 1,
"project_id": 1,
},
- "ref": "master",
+ "ref": "main",
"artifacts": [],
"runner": None,
"stage": "test",
@@ -79,18 +79,18 @@ def resp_retry_job():
def test_get_project_job(project, resp_get_job):
job = project.jobs.get(1)
assert isinstance(job, ProjectJob)
- assert job.ref == "master"
+ assert job.ref == "main"
def test_cancel_project_job(project, resp_cancel_job):
job = project.jobs.get(1, lazy=True)
output = job.cancel()
- assert output["ref"] == "master"
+ assert output["ref"] == "main"
def test_retry_project_job(project, resp_retry_job):
job = project.jobs.get(1, lazy=True)
output = job.retry()
- assert output["ref"] == "master"
+ assert output["ref"] == "main"
diff --git a/tests/unit/objects/test_merge_request_pipelines.py b/tests/unit/objects/test_merge_request_pipelines.py
index 04b04a8..1d2fbf1 100644
--- a/tests/unit/objects/test_merge_request_pipelines.py
+++ b/tests/unit/objects/test_merge_request_pipelines.py
@@ -9,7 +9,7 @@ from gitlab.v4.objects import ProjectMergeRequestPipeline
pipeline_content = {
"id": 1,
"sha": "959e04d7c7a30600c894bd3c0cd0e1ce7f42c11d",
- "ref": "master",
+ "ref": "main",
"status": "success",
}
diff --git a/tests/unit/objects/test_pipeline_schedules.py b/tests/unit/objects/test_pipeline_schedules.py
index c5dcc76..f038756 100644
--- a/tests/unit/objects/test_pipeline_schedules.py
+++ b/tests/unit/objects/test_pipeline_schedules.py
@@ -10,7 +10,7 @@ def resp_project_pipeline_schedule(created_content):
content = {
"id": 14,
"description": "Build packages",
- "ref": "master",
+ "ref": "main",
"cron": "0 1 * * 5",
"cron_timezone": "UTC",
"next_run_at": "2017-05-26T01:00:00.000Z",
@@ -50,7 +50,7 @@ def test_project_pipeline_schedule_play(project, resp_project_pipeline_schedule)
description = "Build packages"
cronline = "0 1 * * 5"
sched = project.pipelineschedules.create(
- {"ref": "master", "description": description, "cron": cronline}
+ {"ref": "main", "description": description, "cron": cronline}
)
assert sched is not None
assert description == sched.description
diff --git a/tests/unit/objects/test_pipelines.py b/tests/unit/objects/test_pipelines.py
index c0b87f2..3412f6d 100644
--- a/tests/unit/objects/test_pipelines.py
+++ b/tests/unit/objects/test_pipelines.py
@@ -10,7 +10,7 @@ pipeline_content = {
"id": 46,
"project_id": 1,
"status": "pending",
- "ref": "master",
+ "ref": "main",
"sha": "a91957a858320c0e17f3a0eca7cfacbff50ea29a",
"before_sha": "a91957a858320c0e17f3a0eca7cfacbff50ea29a",
"tag": False,
@@ -121,21 +121,21 @@ def resp_get_pipeline_test_report():
def test_get_project_pipeline(project, resp_get_pipeline):
pipeline = project.pipelines.get(1)
assert isinstance(pipeline, ProjectPipeline)
- assert pipeline.ref == "master"
+ assert pipeline.ref == "main"
def test_cancel_project_pipeline(project, resp_cancel_pipeline):
pipeline = project.pipelines.get(1, lazy=True)
output = pipeline.cancel()
- assert output["ref"] == "master"
+ assert output["ref"] == "main"
def test_retry_project_pipeline(project, resp_retry_pipeline):
pipeline = project.pipelines.get(1, lazy=True)
output = pipeline.retry()
- assert output["ref"] == "master"
+ assert output["ref"] == "main"
def test_get_project_pipeline_test_report(project, resp_get_pipeline_test_report):
diff --git a/tests/unit/objects/test_project_merge_request_approvals.py b/tests/unit/objects/test_project_merge_request_approvals.py
index 16d58bd..cad9149 100644
--- a/tests/unit/objects/test_project_merge_request_approvals.py
+++ b/tests/unit/objects/test_project_merge_request_approvals.py
@@ -46,7 +46,7 @@ def resp_snippet():
"closed_at": None,
"created_at": "2017-04-29T08:46:00Z",
"updated_at": "2017-04-29T08:46:00Z",
- "target_branch": "master",
+ "target_branch": "main",
"source_branch": "test1",
"upvotes": 0,
"downvotes": 0,
diff --git a/tests/unit/objects/test_runners.py b/tests/unit/objects/test_runners.py
index 686eec2..c54ecdf 100644
--- a/tests/unit/objects/test_runners.py
+++ b/tests/unit/objects/test_runners.py
@@ -51,7 +51,7 @@ runner_jobs = [
"status": "running",
"stage": "test",
"name": "test",
- "ref": "master",
+ "ref": "main",
"tag": False,
"coverage": "99%",
"created_at": "2017-11-16T08:50:29.000Z",
diff --git a/tests/unit/objects/test_submodules.py b/tests/unit/objects/test_submodules.py
index 69c1cd7..fc95aa3 100644
--- a/tests/unit/objects/test_submodules.py
+++ b/tests/unit/objects/test_submodules.py
@@ -37,7 +37,7 @@ def resp_update_submodule():
def test_update_submodule(project, resp_update_submodule):
ret = project.update_submodule(
submodule="foo/bar",
- branch="master",
+ branch="main",
commit_sha="4c3674f66071e30b3311dac9b9ccc90502a72664",
commit_message="Message",
)