From de139943d8272773b5f19ed824d687b0232b9ba3 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sat, 11 Mar 2023 09:03:03 +0100 Subject: Adding upstream version 0.19.1. Signed-off-by: Daniel Baumann --- gitlint-core/gitlint/tests/contrib/rules/test_authors_commit.py | 9 ++++----- .../gitlint/tests/contrib/rules/test_conventional_commit.py | 6 +++--- .../gitlint/tests/contrib/rules/test_disallow_cleanup_commits.py | 7 +++---- gitlint-core/gitlint/tests/contrib/rules/test_signedoff_by.py | 7 +++---- gitlint-core/gitlint/tests/contrib/test_contrib_rules.py | 4 ++-- 5 files changed, 15 insertions(+), 18 deletions(-) (limited to 'gitlint-core/gitlint/tests/contrib') diff --git a/gitlint-core/gitlint/tests/contrib/rules/test_authors_commit.py b/gitlint-core/gitlint/tests/contrib/rules/test_authors_commit.py index 5ea9d8f..2bad2ed 100644 --- a/gitlint-core/gitlint/tests/contrib/rules/test_authors_commit.py +++ b/gitlint-core/gitlint/tests/contrib/rules/test_authors_commit.py @@ -1,10 +1,10 @@ from collections import namedtuple from unittest.mock import patch -from gitlint.tests.base import BaseTestCase -from gitlint.rules import RuleViolation -from gitlint.config import LintConfig +from gitlint.config import LintConfig from gitlint.contrib.rules.authors_commit import AllowedAuthors +from gitlint.rules import RuleViolation +from gitlint.tests.base import BaseTestCase class ContribAuthorsCommitTests(BaseTestCase): @@ -101,6 +101,5 @@ class ContribAuthorsCommitTests(BaseTestCase): return_value=False, ) def test_read_authors_file_missing_file(self, _mock_iterdir): - with self.assertRaises(FileNotFoundError) as err: + with self.assertRaisesMessage(FileNotFoundError, "No AUTHORS file found!"): AllowedAuthors._read_authors_from_file(self.gitcontext) - self.assertEqual(err.exception.args[0], "AUTHORS file not found") diff --git a/gitlint-core/gitlint/tests/contrib/rules/test_conventional_commit.py b/gitlint-core/gitlint/tests/contrib/rules/test_conventional_commit.py index 7ce9c89..cbab684 100644 --- a/gitlint-core/gitlint/tests/contrib/rules/test_conventional_commit.py +++ b/gitlint-core/gitlint/tests/contrib/rules/test_conventional_commit.py @@ -1,7 +1,7 @@ -from gitlint.tests.base import BaseTestCase -from gitlint.rules import RuleViolation -from gitlint.contrib.rules.conventional_commit import ConventionalCommit from gitlint.config import LintConfig +from gitlint.contrib.rules.conventional_commit import ConventionalCommit +from gitlint.rules import RuleViolation +from gitlint.tests.base import BaseTestCase class ContribConventionalCommitTests(BaseTestCase): diff --git a/gitlint-core/gitlint/tests/contrib/rules/test_disallow_cleanup_commits.py b/gitlint-core/gitlint/tests/contrib/rules/test_disallow_cleanup_commits.py index 841640a..1983367 100644 --- a/gitlint-core/gitlint/tests/contrib/rules/test_disallow_cleanup_commits.py +++ b/gitlint-core/gitlint/tests/contrib/rules/test_disallow_cleanup_commits.py @@ -1,8 +1,7 @@ -from gitlint.tests.base import BaseTestCase -from gitlint.rules import RuleViolation -from gitlint.contrib.rules.disallow_cleanup_commits import DisallowCleanupCommits - from gitlint.config import LintConfig +from gitlint.contrib.rules.disallow_cleanup_commits import DisallowCleanupCommits +from gitlint.rules import RuleViolation +from gitlint.tests.base import BaseTestCase class ContribDisallowCleanupCommitsTest(BaseTestCase): diff --git a/gitlint-core/gitlint/tests/contrib/rules/test_signedoff_by.py b/gitlint-core/gitlint/tests/contrib/rules/test_signedoff_by.py index 88ff1db..bf526a0 100644 --- a/gitlint-core/gitlint/tests/contrib/rules/test_signedoff_by.py +++ b/gitlint-core/gitlint/tests/contrib/rules/test_signedoff_by.py @@ -1,8 +1,7 @@ -from gitlint.tests.base import BaseTestCase -from gitlint.rules import RuleViolation -from gitlint.contrib.rules.signedoff_by import SignedOffBy - from gitlint.config import LintConfig +from gitlint.contrib.rules.signedoff_by import SignedOffBy +from gitlint.rules import RuleViolation +from gitlint.tests.base import BaseTestCase class ContribSignedOffByTests(BaseTestCase): diff --git a/gitlint-core/gitlint/tests/contrib/test_contrib_rules.py b/gitlint-core/gitlint/tests/contrib/test_contrib_rules.py index bd098c6..b0372d8 100644 --- a/gitlint-core/gitlint/tests/contrib/test_contrib_rules.py +++ b/gitlint-core/gitlint/tests/contrib/test_contrib_rules.py @@ -1,9 +1,9 @@ import os -from gitlint.tests.base import BaseTestCase +from gitlint import rule_finder, rules from gitlint.contrib import rules as contrib_rules +from gitlint.tests.base import BaseTestCase from gitlint.tests.contrib import rules as contrib_tests -from gitlint import rule_finder, rules class ContribRuleTests(BaseTestCase): -- cgit v1.2.3