summaryrefslogtreecommitdiff
path: root/tests/unit
diff options
context:
space:
mode:
authorIan Cordasco <graffatcolmingov@gmail.com>2016-07-27 11:27:12 +0000
committerIan Cordasco <graffatcolmingov@gmail.com>2016-07-27 11:27:12 +0000
commitbeee924f162e2bb794185b096dae8b68c8eaadab (patch)
treeab02ce61469f7f51e73303188334716a6b15694b /tests/unit
parentd258becbe4ea5644ac57ba0f9542604aa30cb7ed (diff)
parentca02a8c88df1a031b69b7016ecb0d9e837d6c108 (diff)
downloadflake8-beee924f162e2bb794185b096dae8b68c8eaadab.tar.gz
Merge branch 'read_lines_crlf' into 'master'
Fix read_lines_splits_lines test for CRLF endings This change makes the test pass for when files are saved with CRLF Windows-style line endings since those are included in various `.readlines()` methods by default. See merge request !96
Diffstat (limited to 'tests/unit')
-rw-r--r--tests/unit/test_file_processor.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/unit/test_file_processor.py b/tests/unit/test_file_processor.py
index 547d6a0..001a6ba 100644
--- a/tests/unit/test_file_processor.py
+++ b/tests/unit/test_file_processor.py
@@ -23,7 +23,8 @@ def test_read_lines_splits_lines():
file_processor = processor.FileProcessor(__file__, options_from())
lines = file_processor.lines
assert len(lines) > 5
- assert '"""Tests for the FileProcessor class."""\n' in lines
+ assert any('"""Tests for the FileProcessor class."""' in line.rstrip()
+ for line in lines)
@pytest.mark.parametrize('first_line', [