From 83670a49a3affd2465f8fcbcc3c26141592c1ccd Mon Sep 17 00:00:00 2001 From: "John L. Villalovos" Date: Sat, 17 Apr 2021 14:06:36 -0700 Subject: [PATCH] chore: fix E712 errors reported by flake8 E712: Comparison to true should be 'if cond is true:' or 'if cond:' https://www.flake8rules.com/rules/E712.html --- .../test_project_merge_request_approvals.py | 6 +++--- gitlab/tests/objects/test_runners.py | 14 +++++++------- gitlab/tests/test_config.py | 6 +++--- gitlab/tests/test_gitlab_http_methods.py | 2 +- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/gitlab/tests/objects/test_project_merge_request_approvals.py b/gitlab/tests/objects/test_project_merge_request_approvals.py index a8e31e6fe..d8ed3a8ea 100644 --- a/gitlab/tests/objects/test_project_merge_request_approvals.py +++ b/gitlab/tests/objects/test_project_merge_request_approvals.py @@ -241,7 +241,7 @@ def test_project_approval_manager_update_uses_post(project, resp_snippet): assert isinstance( approvals, gitlab.v4.objects.merge_request_approvals.ProjectApprovalManager ) - assert approvals._update_uses_post == True + assert approvals._update_uses_post is True def test_list_merge_request_approval_rules(project, resp_snippet): @@ -257,7 +257,7 @@ def test_update_merge_request_approvals_set_approvers(project, resp_snippet): approvals, gitlab.v4.objects.merge_request_approvals.ProjectMergeRequestApprovalManager, ) - assert approvals._update_uses_post == True + assert approvals._update_uses_post is True response = approvals.set_approvers( updated_approval_rule_approvals_required, approver_ids=updated_approval_rule_user_ids, @@ -277,7 +277,7 @@ def test_create_merge_request_approvals_set_approvers(project, resp_snippet): approvals, gitlab.v4.objects.merge_request_approvals.ProjectMergeRequestApprovalManager, ) - assert approvals._update_uses_post == True + assert approvals._update_uses_post is True response = approvals.set_approvers( new_approval_rule_approvals_required, approver_ids=new_approval_rule_user_ids, diff --git a/gitlab/tests/objects/test_runners.py b/gitlab/tests/objects/test_runners.py index 30fdb41b5..7185c26ad 100644 --- a/gitlab/tests/objects/test_runners.py +++ b/gitlab/tests/objects/test_runners.py @@ -200,7 +200,7 @@ def resp_runner_verify(): def test_owned_runners_list(gl: gitlab.Gitlab, resp_get_runners_list): runners = gl.runners.list() - assert runners[0].active == True + assert runners[0].active is True assert runners[0].id == 6 assert runners[0].name == "test-name" assert len(runners) == 1 @@ -208,7 +208,7 @@ def test_owned_runners_list(gl: gitlab.Gitlab, resp_get_runners_list): def test_project_runners_list(gl: gitlab.Gitlab, resp_get_runners_list): runners = gl.projects.get(1, lazy=True).runners.list() - assert runners[0].active == True + assert runners[0].active is True assert runners[0].id == 6 assert runners[0].name == "test-name" assert len(runners) == 1 @@ -216,7 +216,7 @@ def test_project_runners_list(gl: gitlab.Gitlab, resp_get_runners_list): def test_group_runners_list(gl: gitlab.Gitlab, resp_get_runners_list): runners = gl.groups.get(1, lazy=True).runners.list() - assert runners[0].active == True + assert runners[0].active is True assert runners[0].id == 6 assert runners[0].name == "test-name" assert len(runners) == 1 @@ -224,7 +224,7 @@ def test_group_runners_list(gl: gitlab.Gitlab, resp_get_runners_list): def test_all_runners_list(gl: gitlab.Gitlab, resp_get_runners_list): runners = gl.runners.all() - assert runners[0].active == True + assert runners[0].active is True assert runners[0].id == 6 assert runners[0].name == "test-name" assert len(runners) == 1 @@ -238,7 +238,7 @@ def test_create_runner(gl: gitlab.Gitlab, resp_runner_register): def test_get_update_runner(gl: gitlab.Gitlab, resp_runner_detail): runner = gl.runners.get(6) - assert runner.active == True + assert runner.active is True runner.tag_list.append("new") runner.save() @@ -259,14 +259,14 @@ def test_disable_group_runner(gl: gitlab.Gitlab, resp_runner_disable): def test_enable_project_runner(gl: gitlab.Gitlab, resp_runner_enable): runner = gl.projects.get(1, lazy=True).runners.create({"runner_id": 6}) - assert runner.active == True + assert runner.active is True assert runner.id == 6 assert runner.name == "test-name" def test_enable_group_runner(gl: gitlab.Gitlab, resp_runner_enable): runner = gl.groups.get(1, lazy=True).runners.create({"runner_id": 6}) - assert runner.active == True + assert runner.active is True assert runner.id == 6 assert runner.name == "test-name" diff --git a/gitlab/tests/test_config.py b/gitlab/tests/test_config.py index 58ccbb0cc..e428cd1ba 100644 --- a/gitlab/tests/test_config.py +++ b/gitlab/tests/test_config.py @@ -156,7 +156,7 @@ def test_valid_data(m_open, path_exists): assert "ABCDEF" == cp.private_token assert None == cp.oauth_token assert 2 == cp.timeout - assert True == cp.ssl_verify + assert cp.ssl_verify is True assert cp.per_page is None fd = io.StringIO(valid_config) @@ -168,7 +168,7 @@ def test_valid_data(m_open, path_exists): assert "GHIJKL" == cp.private_token assert None == cp.oauth_token assert 10 == cp.timeout - assert False == cp.ssl_verify + assert cp.ssl_verify is False fd = io.StringIO(valid_config) fd.close = mock.Mock(return_value=None) @@ -191,7 +191,7 @@ def test_valid_data(m_open, path_exists): assert None == cp.private_token assert "STUV" == cp.oauth_token assert 2 == cp.timeout - assert True == cp.ssl_verify + assert cp.ssl_verify is True @mock.patch("os.path.exists") diff --git a/gitlab/tests/test_gitlab_http_methods.py b/gitlab/tests/test_gitlab_http_methods.py index 253ad16b2..7d9e61e6f 100644 --- a/gitlab/tests/test_gitlab_http_methods.py +++ b/gitlab/tests/test_gitlab_http_methods.py @@ -219,7 +219,7 @@ def resp_cont(url, request): with HTTMock(resp_cont): result = gl.http_delete("/projects") assert isinstance(result, requests.Response) - assert result.json() == True + assert result.json() is True def test_delete_request_404(gl):