# HG changeset patch # User Manuel Jacob # Date 1653956347 -7200 # Node ID 402f9f0f938796a0de33c7569706f70c4e58b13a # Parent b6b6ae9ea91ea183a72ff1832b42f9e12e43a549 tests: remove Python 2 special cases in test-stdio.py diff -r b6b6ae9ea91e -r 402f9f0f9387 tests/test-stdio.py --- a/tests/test-stdio.py Sun May 29 15:43:21 2022 +0200 +++ b/tests/test-stdio.py Tue May 31 02:19:07 2022 +0200 @@ -211,22 +211,7 @@ def test_buffering_stdout_ptys_unbuffered(self): self._test_buffering('stdout', _ptys, UNBUFFERED, python_args=['-u']) - if not pycompat.ispy3 and not pycompat.iswindows: - # On Python 2 on non-Windows, we manually open stdout in line-buffered - # mode if connected to a TTY. We should check if Python was configured - # to use unbuffered stdout, but it's hard to do that. - test_buffering_stdout_ptys_unbuffered = unittest.expectedFailure( - test_buffering_stdout_ptys_unbuffered - ) - def _test_large_write(self, stream, rwpair_generator, python_args=[]): - if not pycompat.ispy3 and pycompat.isdarwin: - # Python 2 doesn't always retry on EINTR, but the libc might retry. - # So far, it was observed only on macOS that EINTR is raised at the - # Python level. As Python 2 support will be dropped soon-ish, we - # won't attempt to fix it. - raise unittest.SkipTest("raises EINTR on macOS") - def check_output(stream_receiver, proc): if not pycompat.iswindows: # On Unix, we can provoke a partial write() by interrupting it @@ -243,16 +228,7 @@ ) def post_child_check(): - write_result_str = write_result_f.read() - if pycompat.ispy3: - # On Python 3, we test that the correct number of bytes is - # claimed to have been written. - expected_write_result_str = '1048576' - else: - # On Python 2, we only check that the large write does not - # crash. - expected_write_result_str = 'None' - self.assertEqual(write_result_str, expected_write_result_str) + self.assertEqual(write_result_f.read(), '1048576') with tempfile.NamedTemporaryFile('r') as write_result_f: self._test(