changeset 32079:76ed60630dd5 stable

tests: fix two http tests to also pass inside manylinux1 docker This will let us build Linux wheels.
author Boris Feld <boris.feld@octobus.net>
date Tue, 25 Apr 2017 16:50:01 +0200
parents bf5e13e38390
children fcddcf442e4f
files tests/test-clonebundles.t tests/test-http-proxy.t
diffstat 2 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/tests/test-clonebundles.t	Fri Apr 28 20:51:14 2017 +0900
+++ b/tests/test-clonebundles.t	Tue Apr 25 16:50:01 2017 +0200
@@ -61,7 +61,7 @@
   $ echo "http://localhost:$HGPORT1/bundle.hg" > server/.hg/clonebundles.manifest
   $ hg clone http://localhost:$HGPORT server-not-runner
   applying clone bundle from http://localhost:$HGPORT1/bundle.hg
-  error fetching bundle: (.* refused.*|Protocol not supported) (re)
+  error fetching bundle: (.* refused.*|Protocol not supported|Cannot assign requested address) (re)
   abort: error applying bundle
   (if this error persists, consider contacting the server operator or disable clone bundles via "--config ui.clonebundles=false")
   [255]
--- a/tests/test-http-proxy.t	Fri Apr 28 20:51:14 2017 +0900
+++ b/tests/test-http-proxy.t	Tue Apr 25 16:50:01 2017 +0200
@@ -87,7 +87,7 @@
 misconfigured hosts)
 
   $ http_proxy=localhost:$HGPORT2 hg clone --config http_proxy.always=True http://localhost:$HGPORT/ f
-  abort: error: (Connection refused|Protocol not supported|.* actively refused it) (re)
+  abort: error: (Connection refused|Protocol not supported|.* actively refused it|Cannot assign requested address) (re)
   [255]
 
 do not use the proxy if it is in the no list