From da21f7b7bd17392ef6b406c961d93f8a0b9dbb56 Mon Sep 17 00:00:00 2001 From: Yaroslav Halchenko Date: Tue, 4 Dec 2018 09:58:50 -0500 Subject: [PATCH] BF(workaround): manually replace os.linesep with \n upon "rb" in ok_file_has_content --- datalad/tests/utils.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/datalad/tests/utils.py b/datalad/tests/utils.py index cbab003a19..8c0c40a787 100644 --- a/datalad/tests/utils.py +++ b/datalad/tests/utils.py @@ -410,6 +410,12 @@ def ok_file_has_content(path, content, strip=False, re_=False, if isinstance(content, text_type): file_content = assure_unicode(file_content) + if os.linesep != '\n': + # for consistent comparisons etc. Apparently when reading in `b` mode + # on Windows we would also get \r + # https://github.com/datalad/datalad/pull/3049#issuecomment-444128715 + file_content = file_content.replace(os.linesep, '\n') + if strip: file_content = file_content.strip()