test_capture: allow both Unix and Windows line sep
On Linux/macOS we allow \n in the end of the line.
On Windows we allow both \r\n and \n. Here we also allow Unix line
seperators as tests might be excuted in for example git-shell.
Change-Id: I3975b563cf95407da92e5479980e670eb748b30e
Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/353181
Tested-by: Daniel Kutik <daniel.kutik@lavawerk.com>
Reviewed-by: Mike Frysinger <vapier@google.com>
diff --git a/tests/test_wrapper.py b/tests/test_wrapper.py
index 8447bec..f77ae1e 100644
--- a/tests/test_wrapper.py
+++ b/tests/test_wrapper.py
@@ -159,7 +159,9 @@
def test_capture(self):
"""Check capture_output handling."""
ret = self.wrapper.run_command(['echo', 'hi'], capture_output=True)
- self.assertEqual(ret.stdout, 'hi\n')
+ # echo command appends OS specific linesep, but on Windows + Git Bash
+ # we get UNIX ending, so we allow both.
+ self.assertIn(ret.stdout, ['hi' + os.linesep, 'hi\n'])
def test_check(self):
"""Check check handling."""
