Patchwork D5401: tests: update network related errors for Debian 9

login
register
mail settings
Submitter phabricator
Date Dec. 10, 2018, 3:27 p.m.
Message ID <e77c9799969e5e5f567bb370efab4bb4@localhost.localdomain>
Download mbox | patch
Permalink /patch/37052/
State Not Applicable
Headers show

Comments

phabricator - Dec. 10, 2018, 3:27 p.m.
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG8695fbe17f7c: tests: update network related errors for Debian 9 (authored by lothiraldan, committed by ).

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D5401?vs=12767&id=12768

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

AFFECTED FILES
  tests/common-pattern.py
  tests/test-http-bad-server.t
  tests/test-http-proxy.t
  tests/test-lfs-serve-access.t

CHANGE DETAILS




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

Patch

diff --git a/tests/test-lfs-serve-access.t b/tests/test-lfs-serve-access.t
--- a/tests/test-lfs-serve-access.t
+++ b/tests/test-lfs-serve-access.t
@@ -82,7 +82,8 @@ 
   [255]
 
   $ hg -R httpclone update default --config lfs.url=http://localhost:$HGPORT2/missing
-  abort: LFS error: *onnection *refused*! (glob)
+  abort: LFS error: *onnection *refused*! (glob) (?)
+  abort: LFS error: $EADDRNOTAVAIL$! (glob) (?)
   (the "lfs.url" config may be used to override http://localhost:$HGPORT2/missing)
   [255]
 
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,7 +90,8 @@ 
 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|Cannot assign requested address) (re)
+  abort: error: (Connection refused|Protocol not supported|.* actively refused it) (re) (?)
+  abort: error: $EADDRNOTAVAIL$ (?)
   [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
@@ -36,7 +36,8 @@ 
   $ cat hg.pid > $DAEMON_PIDS
 
   $ hg clone http://localhost:$HGPORT/ clone
-  abort: error: $ECONNRESET$
+  abort: error: $ECONNRESET$ (?)
+  abort: error: $EADDRNOTAVAIL$ (?)
   [255]
 
 (The server exits on its own, but there is a race between that and starting a new server.
diff --git a/tests/common-pattern.py b/tests/common-pattern.py
--- a/tests/common-pattern.py
+++ b/tests/common-pattern.py
@@ -143,6 +143,12 @@ 
         br'Only one usage of each socket address'
         br' \(protocol/network address/port\) is normally permitted',
     ),
+    br'$EADDRNOTAVAIL$': (
+        # strerror()
+        br'Cannot assign requested address',
+
+        # FormatMessage(WSAEADDRNOTAVAIL)
+    )
 }
 
 for replace, msgs in _errors.items():