Improve error message for malformed per-file-ignores

2 files changed, 29 insertions, 1 deletions

diff --git a/tests/integration/test_main.py b/tests/integration/test_main.py
index 56f9414..ba4dd56 100644
--- a/tests/integration/test_main.py
+++ b/tests/integration/test_main.py
@@ -58,3 +58,30 @@ t.py:2:1: F401 'sys' imported but unused
 2     F401 'os' imported but unused
 '''
     assert err == ''
+
+
+def test_malformed_per_file_ignores_error(tmpdir, capsys):
+    """Test the error message for malformed `per-file-ignores`."""
+    setup_cfg = '''\
+[flake8]
+per-file-ignores =
+    incorrect/*
+    values/*
+'''
+
+    with tmpdir.as_cwd():
+        tmpdir.join('setup.cfg').write(setup_cfg)
+
+        app = application.Application()
+        app.run(['.'])
+
+    out, err = capsys.readouterr()
+    assert out == '''\
+There was a critical error during execution of Flake8:
+Expected `per-file-ignores` to be a mapping from file exclude patterns to ignore codes.
+
+Configured `per-file-ignores` setting:
+
+    incorrect/*
+    values/*
+'''  # noqa: E501
diff --git a/tests/unit/test_utils.py b/tests/unit/test_utils.py
index b0eac9a..4b70918 100644
--- a/tests/unit/test_utils.py
+++ b/tests/unit/test_utils.py
@@ -4,6 +4,7 @@ import os
 import mock
 import pytest
 
+from flake8 import exceptions
 from flake8 import utils
 from flake8.plugins import manager as plugin_manager
 
@@ -111,7 +112,7 @@ def test_parse_files_to_codes_mapping(value, expected):
 )
 def test_invalid_file_list(value):
     """Test parsing of invalid files-to-codes mappings."""
-    with pytest.raises(ValueError):
+    with pytest.raises(exceptions.ExecutionError):
         utils.parse_files_to_codes_mapping(value)