diff --git a/tests/rules/common.py b/tests/common.py similarity index 100% rename from tests/rules/common.py rename to tests/common.py diff --git a/tests/rules/test_braces.py b/tests/rules/test_braces.py index 69f30af..0262ae0 100644 --- a/tests/rules/test_braces.py +++ b/tests/rules/test_braces.py @@ -14,7 +14,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -from tests.rules.common import RuleTestCase +from tests.common import RuleTestCase class ColonTestCase(RuleTestCase): diff --git a/tests/rules/test_brackets.py b/tests/rules/test_brackets.py index 512cee8..8fb8006 100644 --- a/tests/rules/test_brackets.py +++ b/tests/rules/test_brackets.py @@ -14,7 +14,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -from tests.rules.common import RuleTestCase +from tests.common import RuleTestCase class ColonTestCase(RuleTestCase): diff --git a/tests/rules/test_colons.py b/tests/rules/test_colons.py index 05538a2..59dc8c4 100644 --- a/tests/rules/test_colons.py +++ b/tests/rules/test_colons.py @@ -14,7 +14,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -from tests.rules.common import RuleTestCase +from tests.common import RuleTestCase class ColonTestCase(RuleTestCase): diff --git a/tests/rules/test_commas.py b/tests/rules/test_commas.py index 97cc08d..710bcd0 100644 --- a/tests/rules/test_commas.py +++ b/tests/rules/test_commas.py @@ -14,7 +14,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -from tests.rules.common import RuleTestCase +from tests.common import RuleTestCase class CommaTestCase(RuleTestCase): diff --git a/tests/rules/test_comments.py b/tests/rules/test_comments.py index e6468f1..f6c96b9 100644 --- a/tests/rules/test_comments.py +++ b/tests/rules/test_comments.py @@ -14,7 +14,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -from tests.rules.common import RuleTestCase +from tests.common import RuleTestCase class CommentsTestCase(RuleTestCase): diff --git a/tests/rules/test_comments_indentation.py b/tests/rules/test_comments_indentation.py index 1362cc1..aa50505 100644 --- a/tests/rules/test_comments_indentation.py +++ b/tests/rules/test_comments_indentation.py @@ -14,7 +14,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -from tests.rules.common import RuleTestCase +from tests.common import RuleTestCase class CommentsIndentationTestCase(RuleTestCase): diff --git a/tests/rules/test_document_end.py b/tests/rules/test_document_end.py index 04389af..82d5772 100644 --- a/tests/rules/test_document_end.py +++ b/tests/rules/test_document_end.py @@ -14,7 +14,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -from tests.rules.common import RuleTestCase +from tests.common import RuleTestCase class DocumentEndTestCase(RuleTestCase): diff --git a/tests/rules/test_document_start.py b/tests/rules/test_document_start.py index b19dc8f..15fe2b7 100644 --- a/tests/rules/test_document_start.py +++ b/tests/rules/test_document_start.py @@ -14,7 +14,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -from tests.rules.common import RuleTestCase +from tests.common import RuleTestCase class DocumentStartTestCase(RuleTestCase): diff --git a/tests/rules/test_empty_lines.py b/tests/rules/test_empty_lines.py index 5c5e819..b44a8a5 100644 --- a/tests/rules/test_empty_lines.py +++ b/tests/rules/test_empty_lines.py @@ -14,7 +14,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -from tests.rules.common import RuleTestCase +from tests.common import RuleTestCase class EmptyLinesTestCase(RuleTestCase): diff --git a/tests/rules/test_hyphens.py b/tests/rules/test_hyphens.py index 20c4422..648039d 100644 --- a/tests/rules/test_hyphens.py +++ b/tests/rules/test_hyphens.py @@ -14,7 +14,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -from tests.rules.common import RuleTestCase +from tests.common import RuleTestCase class HyphenTestCase(RuleTestCase): diff --git a/tests/rules/test_indentation.py b/tests/rules/test_indentation.py index 75f9ac7..ca86665 100644 --- a/tests/rules/test_indentation.py +++ b/tests/rules/test_indentation.py @@ -14,7 +14,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -from tests.rules.common import RuleTestCase +from tests.common import RuleTestCase class IndentationTestCase(RuleTestCase): diff --git a/tests/rules/test_line_length.py b/tests/rules/test_line_length.py index ea7fc2c..4e5cb78 100644 --- a/tests/rules/test_line_length.py +++ b/tests/rules/test_line_length.py @@ -14,7 +14,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -from tests.rules.common import RuleTestCase +from tests.common import RuleTestCase class LineLengthTestCase(RuleTestCase): diff --git a/tests/rules/test_new_line_at_end_of_file.py b/tests/rules/test_new_line_at_end_of_file.py index 1c80668..ff90976 100644 --- a/tests/rules/test_new_line_at_end_of_file.py +++ b/tests/rules/test_new_line_at_end_of_file.py @@ -14,7 +14,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -from tests.rules.common import RuleTestCase +from tests.common import RuleTestCase class NewLineAtEndOfFileTestCase(RuleTestCase): diff --git a/tests/rules/test_new_lines.py b/tests/rules/test_new_lines.py index e330e03..c77a5d7 100644 --- a/tests/rules/test_new_lines.py +++ b/tests/rules/test_new_lines.py @@ -14,7 +14,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -from tests.rules.common import RuleTestCase +from tests.common import RuleTestCase class NewLinesTestCase(RuleTestCase): diff --git a/tests/rules/test_trailing_spaces.py b/tests/rules/test_trailing_spaces.py index 9bbfbfd..58ad026 100644 --- a/tests/rules/test_trailing_spaces.py +++ b/tests/rules/test_trailing_spaces.py @@ -14,7 +14,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -from tests.rules.common import RuleTestCase +from tests.common import RuleTestCase class TrailingSpacesTestCase(RuleTestCase): diff --git a/tests/rules/test_syntax_error.py b/tests/test_syntax_errors.py similarity index 96% rename from tests/rules/test_syntax_error.py rename to tests/test_syntax_errors.py index 3796e6d..6a94261 100644 --- a/tests/rules/test_syntax_error.py +++ b/tests/test_syntax_errors.py @@ -14,13 +14,13 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -from tests.rules.common import RuleTestCase +from tests.common import RuleTestCase class YamlLintTestCase(RuleTestCase): rule_id = None # syntax error - def test_lint(self): + def test_syntax_errors(self): self.check('---\n' 'this is not: valid: YAML\n', None, problem=(2, 19)) self.check('---\n' @@ -29,8 +29,6 @@ class YamlLintTestCase(RuleTestCase): 'this is an error: [\n' '\n' '...\n', None, problem=(6, 1)) - - def test_directives(self): self.check('%YAML 1.2\n' '%TAG ! tag:clarkevans.com,2002:\n' 'doc: ument\n'