Patchwork D5445: tests: followup on network related errors on Debian 9

login
register
mail settings
Submitter phabricator
Date Dec. 17, 2018, 11:21 a.m.
Message ID <6692df68839485914c85ec4585093058@localhost.localdomain>
Download mbox | patch
Permalink /patch/37216/
State Not Applicable
Headers show

Comments

phabricator - Dec. 17, 2018, 11:21 a.m.
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG97484e1d1834: tests: followup on network related errors on Debian 9 (authored by lothiraldan, committed by ).

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D5445?vs=12887&id=12888

REVISION DETAIL
  https://phab.mercurial-scm.org/D5445

AFFECTED FILES
  tests/test-clonebundles.t
  tests/test-http-bad-server.t
  tests/test-http-proxy.t

CHANGE DETAILS




To: lothiraldan, #hg-reviewers
Cc: mercurial-devel

Patch

diff --git a/tests/test-http-proxy.t b/tests/test-http-proxy.t
--- a/tests/test-http-proxy.t
+++ b/tests/test-http-proxy.t
@@ -90,8 +90,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: $EADDRNOTAVAIL$ (?)
+  abort: error: (Connection refused|Protocol not supported|.* actively refused it|\$EADDRNOTAVAIL\$) (re)
   [255]
 
 do not use the proxy if it is in the no list
diff --git a/tests/test-http-bad-server.t b/tests/test-http-bad-server.t
--- a/tests/test-http-bad-server.t
+++ b/tests/test-http-bad-server.t
@@ -38,8 +38,7 @@ 
   $ cat hg.pid > $DAEMON_PIDS
 
   $ hg clone http://localhost:$HGPORT/ clone
-  abort: error: $ECONNRESET$ (?)
-  abort: error: $EADDRNOTAVAIL$ (?)
+  abort: error: (\$ECONNRESET\$|\$EADDRNOTAVAIL\$) (re)
   [255]
 
 (The server exits on its own, but there is a race between that and starting a new server.
diff --git a/tests/test-clonebundles.t b/tests/test-clonebundles.t
--- a/tests/test-clonebundles.t
+++ b/tests/test-clonebundles.t
@@ -64,7 +64,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|(.* )?Cannot assign requested address) (re)
+  error fetching bundle: (.* refused.*|Protocol not supported|(.* )?\$EADDRNOTAVAIL\$) (re)
   abort: error applying bundle
   (if this error persists, consider contacting the server operator or disable clone bundles via "--config ui.clonebundles=false")
   [255]