From 0215257c613d55bec27201683f3dcb00f1726536 Mon Sep 17 00:00:00 2001 From: "Miss Islington (bot)" <31488909+miss-islington@users.noreply.github.com> Date: Thu, 19 Aug 2021 03:35:28 -0700 Subject: [PATCH] bpo-44949: Fix test_readline auto history tests (GH-27813) (GH-27822) (cherry picked from commit 6fb62b42f4db56ed5efe0ca4c1059049276c1083) Co-authored-by: Victor Stinner --- Lib/test/test_readline.py | 8 ++++++-- .../next/Tests/2021-08-18-18-30-12.bpo-44949.VE5ENv.rst | 2 ++ 2 files changed, 8 insertions(+), 2 deletions(-) create mode 100644 Misc/NEWS.d/next/Tests/2021-08-18-18-30-12.bpo-44949.VE5ENv.rst diff --git a/Lib/test/test_readline.py b/Lib/test/test_readline.py index 67ee9b7f7cf..7898abb7a61 100644 --- a/Lib/test/test_readline.py +++ b/Lib/test/test_readline.py @@ -147,11 +147,15 @@ print("History length:", readline.get_current_history_length()) def test_auto_history_enabled(self): output = run_pty(self.auto_history_script.format(True)) - self.assertIn(b"History length: 1\r\n", output) + # bpo-44949: Sometimes, the newline character is not written at the + # end, so don't expect it in the output. + self.assertIn(b"History length: 1", output) def test_auto_history_disabled(self): output = run_pty(self.auto_history_script.format(False)) - self.assertIn(b"History length: 0\r\n", output) + # bpo-44949: Sometimes, the newline character is not written at the + # end, so don't expect it in the output. + self.assertIn(b"History length: 0", output) def test_nonascii(self): loc = locale.setlocale(locale.LC_CTYPE, None) diff --git a/Misc/NEWS.d/next/Tests/2021-08-18-18-30-12.bpo-44949.VE5ENv.rst b/Misc/NEWS.d/next/Tests/2021-08-18-18-30-12.bpo-44949.VE5ENv.rst new file mode 100644 index 00000000000..7fdf1810b16 --- /dev/null +++ b/Misc/NEWS.d/next/Tests/2021-08-18-18-30-12.bpo-44949.VE5ENv.rst @@ -0,0 +1,2 @@ +Fix auto history tests of test_readline: sometimes, the newline character is +not written at the end, so don't expect it in the output.