From 29d8b112093f5d564afe09b2a6f6c618a3cb2643 Mon Sep 17 00:00:00 2001 From: Byeonghoon Yoo Date: Tue, 5 Nov 2019 22:00:05 +0900 Subject: [PATCH] Add unit test for dd411e95 --- tests/unit/conftest.py | 1 + tests/unit/test_file_processor.py | 33 +++++++++++++++++++------------ 2 files changed, 21 insertions(+), 13 deletions(-) diff --git a/tests/unit/conftest.py b/tests/unit/conftest.py index 3541ec3..eb76f98 100644 --- a/tests/unit/conftest.py +++ b/tests/unit/conftest.py @@ -11,6 +11,7 @@ def options_from(**kwargs): kwargs.setdefault('max_doc_length', None) kwargs.setdefault('verbose', False) kwargs.setdefault('stdin_display_name', 'stdin') + kwargs.setdefault('disable_noqa', False) return argparse.Namespace(**kwargs) diff --git a/tests/unit/test_file_processor.py b/tests/unit/test_file_processor.py index afae77d..ad2f5bd 100644 --- a/tests/unit/test_file_processor.py +++ b/tests/unit/test_file_processor.py @@ -57,21 +57,28 @@ def test_strip_utf_bom(first_line, default_options): assert file_processor.lines[0] == '"""Module docstring."""\n' -@pytest.mark.parametrize('lines, expected', [ - (['\xEF\xBB\xBF"""Module docstring."""\n'], False), - ([u'\uFEFF"""Module docstring."""\n'], False), - (['#!/usr/bin/python', '# flake8 is great', 'a = 1'], False), - (['#!/usr/bin/python', '# flake8: noqa', 'a = 1'], True), - (['#!/usr/bin/python', '# flake8:noqa', 'a = 1'], True), - (['# flake8: noqa', '#!/usr/bin/python', 'a = 1'], True), - (['# flake8:noqa', '#!/usr/bin/python', 'a = 1'], True), - (['#!/usr/bin/python', 'a = 1', '# flake8: noqa'], True), - (['#!/usr/bin/python', 'a = 1', '# flake8:noqa'], True), - (['#!/usr/bin/python', 'a = 1 # flake8: noqa'], False), - (['#!/usr/bin/python', 'a = 1 # flake8:noqa'], False), +@pytest.mark.parametrize('lines, expected, disable_noqa', [ + (['\xEF\xBB\xBF"""Module docstring."""\n'], False, False), + ([u'\uFEFF"""Module docstring."""\n'], False, False), + (['#!/usr/bin/python', '# flake8 is great', 'a = 1'], False, False), + (['#!/usr/bin/python', '# flake8: noqa', 'a = 1'], True, False), + (['#!/usr/bin/python', '# flake8: noqa', 'a = 1'], False, True), + (['#!/usr/bin/python', '# flake8:noqa', 'a = 1'], True, False), + (['#!/usr/bin/python', '# flake8:noqa', 'a = 1'], False, True), + (['# flake8: noqa', '#!/usr/bin/python', 'a = 1'], True, False), + (['# flake8: noqa', '#!/usr/bin/python', 'a = 1'], False, True), + (['# flake8:noqa', '#!/usr/bin/python', 'a = 1'], True, False), + (['# flake8:noqa', '#!/usr/bin/python', 'a = 1'], False, True), + (['#!/usr/bin/python', 'a = 1', '# flake8: noqa'], True, False), + (['#!/usr/bin/python', 'a = 1', '# flake8: noqa'], False, True), + (['#!/usr/bin/python', 'a = 1', '# flake8:noqa'], True, False), + (['#!/usr/bin/python', 'a = 1', '# flake8:noqa'], False, True), + (['#!/usr/bin/python', 'a = 1 # flake8: noqa'], False, False), + (['#!/usr/bin/python', 'a = 1 # flake8:noqa'], False, False), ]) -def test_should_ignore_file(lines, expected, default_options): +def test_should_ignore_file(lines, expected, disable_noqa, default_options): """Verify that we ignore a file if told to.""" + default_options.disable_noqa = disable_noqa file_processor = processor.FileProcessor('-', default_options, lines) assert file_processor.should_ignore_file() is expected