|
20 | 20 | captured_stdout, |
21 | 21 | captured_stderr, |
22 | 22 | force_not_colorized, |
23 | | - gc_collect, |
24 | 23 | make_clean_env, |
25 | 24 | Py_DEBUG, |
26 | 25 | ) |
@@ -2728,36 +2727,20 @@ def test_exact_width_line_does_not_wrap(self): |
2728 | 2727 |
|
2729 | 2728 | @skipUnless(pty, "requires pty") |
2730 | 2729 | class TestReadlineWrapperFileDescriptors(TestCase): |
2731 | | - def setUp(self): |
2732 | | - controller, self.worker = pty.openpty() |
| 2730 | + def test_reader_does_not_open_file_descriptors(self): |
| 2731 | + controller, worker = pty.openpty() |
2733 | 2732 | self.addCleanup(os.close, controller) |
2734 | | - self.addCleanup(os.close, self.worker) |
| 2733 | + self.addCleanup(os.close, worker) |
2735 | 2734 | env = self.enterContext(EnvironmentVarGuard()) |
2736 | 2735 | env["TERM"] = "ansi" |
2737 | | - |
2738 | | - def redirect_stdio_to_pty(self): |
2739 | 2736 | sys.stdout.flush() |
2740 | 2737 | for fd in (0, 1): |
2741 | 2738 | saved = os.dup(fd) |
2742 | 2739 | self.addCleanup(os.close, saved) |
2743 | 2740 | self.addCleanup(os.dup2, saved, fd) |
2744 | | - os.dup2(self.worker, fd) |
| 2741 | + os.dup2(worker, fd) |
2745 | 2742 |
|
2746 | | - def test_dupped_fds_are_closed_with_wrapper(self): |
2747 | | - self.redirect_stdio_to_pty() |
2748 | 2743 | before = fd_count() |
2749 | 2744 | wrapper = _ReadlineWrapper() |
2750 | | - self.assertEqual(fd_count(), before) |
2751 | | - wrapper.get_reader() |
2752 | | - self.assertEqual(fd_count(), before + 2) |
2753 | | - del wrapper |
2754 | | - gc_collect() |
2755 | | - self.assertEqual(fd_count(), before) |
2756 | | - |
2757 | | - def test_given_fds_are_not_closed_with_wrapper(self): |
2758 | | - before = fd_count() |
2759 | | - wrapper = _ReadlineWrapper(f_in=self.worker, f_out=self.worker) |
2760 | 2745 | wrapper.get_reader() |
2761 | | - del wrapper |
2762 | | - gc_collect() |
2763 | 2746 | self.assertEqual(fd_count(), before) |
0 commit comments