summaryrefslogtreecommitdiff
path: root/tests/unit/conftest.py
diff options
context:
space:
mode:
authorAnthony Sottile <asottile@umich.edu>2019-12-03 17:45:45 +0000
committerAnthony Sottile <asottile@umich.edu>2019-12-03 17:45:45 +0000
commit21d2adf21f86471d0bf56e6d444764aa3bb35884 (patch)
tree18395a71ffe24a7f03dae269e611632d914b81ca /tests/unit/conftest.py
parent2ab681a4be8bc9a422080ad7f8c3a871292b90fa (diff)
parent3b80b2e05a075e8de7149035643b2498e5a25c02 (diff)
downloadflake8-21d2adf21f86471d0bf56e6d444764aa3bb35884.tar.gz
Merge branch 'fix/disable_noqa' into 'master'
`--disable-noqa` does not override `# flake8: noqa` Closes #590 See merge request pycqa/flake8!380
Diffstat (limited to 'tests/unit/conftest.py')
-rw-r--r--tests/unit/conftest.py1
1 files changed, 1 insertions, 0 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)