]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
bpo-44949: Fix test_readline auto history tests (GH-27813)
authorMiss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Thu, 19 Aug 2021 08:52:16 +0000 (01:52 -0700)
committerGitHub <noreply@github.com>
Thu, 19 Aug 2021 08:52:16 +0000 (01:52 -0700)
(cherry picked from commit 6fb62b42f4db56ed5efe0ca4c1059049276c1083)

Co-authored-by: Victor Stinner <vstinner@python.org>
Lib/test/test_readline.py
Misc/NEWS.d/next/Tests/2021-08-18-18-30-12.bpo-44949.VE5ENv.rst [new file with mode: 0644]

index f3e404da6f0b87906f238d35bfdad62cfc560420..e8fb8d2f9cc603ac450b319b738849daf44b7c74 100644 (file)
@@ -156,11 +156,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 (file)
index 0000000..7fdf181
--- /dev/null
@@ -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.