Patchwork [1,of,2] tests: remove test targeting Python 2.6

login
register
mail settings
Submitter Gregory Szorc
Date May 8, 2017, 10:32 p.m.
Message ID <50eabab39ddfb8b5db7a.1494282751@ubuntu-vm-main>
Download mbox | patch
Permalink /patch/20526/
State Accepted
Headers show

Comments

Gregory Szorc - May 8, 2017, 10:32 p.m.
# HG changeset patch
# User Gregory Szorc <gregory.szorc@gmail.com>
# Date 1494282615 25200
#      Mon May 08 15:30:15 2017 -0700
# Node ID 50eabab39ddfb8b5db7acef36827755166a59a9d
# Parent  52ec3072fe46bc4b193b6273357e3cc40b4421ad
tests: remove test targeting Python 2.6

We just removed support for Python 2.7. This test is dead since it only
ran on <2.7.
Yuya Nishihara - May 9, 2017, 1:35 p.m.
On Mon, 08 May 2017 15:32:31 -0700, Gregory Szorc wrote:
> # HG changeset patch
> # User Gregory Szorc <gregory.szorc@gmail.com>
> # Date 1494282615 25200
> #      Mon May 08 15:30:15 2017 -0700
> # Node ID 50eabab39ddfb8b5db7acef36827755166a59a9d
> # Parent  52ec3072fe46bc4b193b6273357e3cc40b4421ad
> tests: remove test targeting Python 2.6

Queued, thanks.

Patch

diff --git a/tests/test-https.t b/tests/test-https.t
--- a/tests/test-https.t
+++ b/tests/test-https.t
@@ -333,20 +333,9 @@  Disabling the TLS 1.0 warning works
   > --config hostsecurity.disabletls10warning=true
   5fed3813f7f5
 
-#if no-sslcontext no-py27+
-Setting ciphers doesn't work in Python 2.6
-  $ P="$CERTSDIR" hg --config hostsecurity.ciphers=HIGH -R copy-pull id https://localhost:$HGPORT/
-  warning: connecting to localhost using legacy security technology (TLS 1.0); see https://mercurial-scm.org/wiki/SecureConnections for more info
-  abort: setting ciphers in [hostsecurity] is not supported by this version of Python
-  (remove the config option or run Mercurial with a modern Python version (preferred))
-  [255]
-#endif
+Error message for setting ciphers is different depending on SSLContext support
 
-Setting ciphers works in Python 2.7+ but the error message is different on
-legacy ssl. We test legacy once and do more feature checking on modern
-configs.
-
-#if py27+ no-sslcontext
+#if no-sslcontext
   $ P="$CERTSDIR" hg --config hostsecurity.ciphers=invalid -R copy-pull id https://localhost:$HGPORT/
   warning: connecting to localhost using legacy security technology (TLS 1.0); see https://mercurial-scm.org/wiki/SecureConnections for more info
   abort: *No cipher can be selected. (glob)