Patchwork [stable] tests: fix wireproto redirection test on systems without tls1.2

login
register
mail settings
Submitter Augie Fackler
Date Nov. 13, 2018, 8:43 p.m.
Message ID <53b7b24c957b0ecbfb8c.1542141814@augie-macbookpro2.roam.corp.google.com>
Download mbox | patch
Permalink /patch/36561/
State Superseded
Headers show

Comments

Augie Fackler - Nov. 13, 2018, 8:43 p.m.
# HG changeset patch
# User Augie Fackler <augie@google.com>
# Date 1542141748 18000
#      Tue Nov 13 15:42:28 2018 -0500
# Branch stable
# Node ID 53b7b24c957b0ecbfb8c20dab0c820b07b12ddd0
# Parent  7e2c58b08e74514541101f5049eea8a1ff4ba4a7
tests: fix wireproto redirection test on systems without tls1.2

Our automated package builder has some ancient configuration that
lacks modern TLS, which is how we noticed this.
Augie Fackler - Nov. 13, 2018, 11:11 p.m.
> On Nov 13, 2018, at 15:43, Augie Fackler <raf@durin42.com> wrote:
> 
> # HG changeset patch
> # User Augie Fackler <augie@google.com>
> # Date 1542141748 18000
> #      Tue Nov 13 15:42:28 2018 -0500
> # Branch stable
> # Node ID 53b7b24c957b0ecbfb8c20dab0c820b07b12ddd0
> # Parent  7e2c58b08e74514541101f5049eea8a1ff4ba4a7
> tests: fix wireproto redirection test on systems without tls1.2

ugh, seeing a new failure on old-TLS systems, ignore this. I'll get a v2 out tomorrow. :(

> 
> Our automated package builder has some ancient configuration that
> lacks modern TLS, which is how we noticed this.
> 
> diff --git a/tests/test-wireproto-content-redirects.t b/tests/test-wireproto-content-redirects.t
> --- a/tests/test-wireproto-content-redirects.t
> +++ b/tests/test-wireproto-content-redirects.t
> @@ -30,6 +30,7 @@
>        0       0 992f4779029a3df8d0666d00bb924f69634e2641 0000000000000000000000000000000000000000 0000000000000000000000000000000000000000
>        1       1 a988fb43583e871d1ed5750ee074c6d840bbbfc8 992f4779029a3df8d0666d00bb924f69634e2641 0000000000000000000000000000000000000000
> 
> +#if tls1.2
>   $ hg --config simplecache.redirectsfile=redirects.py serve -p $HGPORT -d --pid-file hg.pid -E error.log
>   $ cat hg.pid > $DAEMON_PIDS
> 
> @@ -357,6 +358,7 @@ Redirect targets advertised when configu
>     }
>   ]
>   (sent 2 HTTP requests and * bytes; received * bytes in responses) (glob)
> +#endif
> 
> Unknown protocol is filtered from compatible targets
> 
> _______________________________________________
> Mercurial-devel mailing list
> Mercurial-devel@mercurial-scm.org
> https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

Patch

diff --git a/tests/test-wireproto-content-redirects.t b/tests/test-wireproto-content-redirects.t
--- a/tests/test-wireproto-content-redirects.t
+++ b/tests/test-wireproto-content-redirects.t
@@ -30,6 +30,7 @@ 
        0       0 992f4779029a3df8d0666d00bb924f69634e2641 0000000000000000000000000000000000000000 0000000000000000000000000000000000000000
        1       1 a988fb43583e871d1ed5750ee074c6d840bbbfc8 992f4779029a3df8d0666d00bb924f69634e2641 0000000000000000000000000000000000000000
 
+#if tls1.2
   $ hg --config simplecache.redirectsfile=redirects.py serve -p $HGPORT -d --pid-file hg.pid -E error.log
   $ cat hg.pid > $DAEMON_PIDS
 
@@ -357,6 +358,7 @@  Redirect targets advertised when configu
     }
   ]
   (sent 2 HTTP requests and * bytes; received * bytes in responses) (glob)
+#endif
 
 Unknown protocol is filtered from compatible targets