From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Thu, 19 Aug 2021 10:35:28 +0000 (-0700)
Subject: bpo-44949: Fix test_readline auto history tests (GH-27813) (GH-27822)
X-Git-Tag: v3.9.7~40
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0215257c613d55bec27201683f3dcb00f1726536;p=thirdparty%2FPython%2Fcpython.git

bpo-44949: Fix test_readline auto history tests (GH-27813) (GH-27822)

(cherry picked from commit 6fb62b42f4db56ed5efe0ca4c1059049276c1083)

Co-authored-by: Victor Stinner <vstinner@python.org>
---

diff --git a/Lib/test/test_readline.py b/Lib/test/test_readline.py
index 67ee9b7f7cfb..7898abb7a61d 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 000000000000..7fdf1810b165
--- /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.