From: Nir Soffer <nirsof@gmail.com>
Date: Sat, 8 Jul 2017 14:34:27 +0000 (+0300)
Subject: bpo-29854: Skip history-size test on older readline (GH-2621)
X-Git-Tag: v3.7.0a1~446
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=aa6a4d6ed881f79c51fb91dd928ed9496737b420;p=thirdparty%2FPython%2Fcpython.git

bpo-29854: Skip history-size test on older readline (GH-2621)

Turns out that history-size was added in readline 6.0. This explain why
this tests fail on FreeBSD when using readline 5.2. We skip now the
history size if readline does not support it.

See https://cnswww.cns.cwru.edu/php/chet/readline/CHANGES for
details.
---

diff --git a/Lib/test/test_readline.py b/Lib/test/test_readline.py
index 5c3728614944..b4c25dee9d3c 100644
--- a/Lib/test/test_readline.py
+++ b/Lib/test/test_readline.py
@@ -226,6 +226,13 @@ print("history", ascii(readline.get_history_item(1)))
         self.assertIn(b"result " + expected + b"\r\n", output)
         self.assertIn(b"history " + expected + b"\r\n", output)
 
+    # We have 2 reasons to skip this test:
+    # - readline: history size was added in 6.0
+    #   See https://cnswww.cns.cwru.edu/php/chet/readline/CHANGES
+    # - editline: history size is broken on OS X 10.11.6.
+    #   Newer versions were not tested yet.
+    @unittest.skipIf(readline._READLINE_VERSION < 0x600,
+                     "this readline version does not support history-size")
     @unittest.skipIf(is_editline,
                      "editline history size configuration is broken")
     def test_history_size(self):