Patchwork tests: relax "Connection refused" match

login
register
mail settings
Submitter Augie Fackler
Date July 12, 2016, 3:20 p.m.
Message ID <93b3703c8e5856932b6c.1468336842@arthedain.pit.corp.google.com>
Download mbox | patch
Permalink /patch/15797/
State Accepted
Headers show

Comments

Augie Fackler - July 12, 2016, 3:20 p.m.
# HG changeset patch
# User Augie Fackler <augie@google.com>
# Date 1468336830 14400
#      Tue Jul 12 11:20:30 2016 -0400
# Node ID 93b3703c8e5856932b6cc83e45ad635b4eb5f5d1
# Parent  be68a44450416581227c43216f07ad8a71e550bc
tests: relax "Connection refused" match

We already had the match relaxed on Windows, but on Google Compute
Engine VMs I'm seeing "Network is unreachable" instead of "Connection
refused". At this point, just give up and make sure we get an error back.
Yuya Nishihara - July 13, 2016, 12:53 p.m.
On Tue, 12 Jul 2016 11:20:42 -0400, Augie Fackler wrote:
> # HG changeset patch
> # User Augie Fackler <augie@google.com>
> # Date 1468336830 14400
> #      Tue Jul 12 11:20:30 2016 -0400
> # Node ID 93b3703c8e5856932b6cc83e45ad635b4eb5f5d1
> # Parent  be68a44450416581227c43216f07ad8a71e550bc
> tests: relax "Connection refused" match
> 
> We already had the match relaxed on Windows, but on Google Compute
> Engine VMs I'm seeing "Network is unreachable" instead of "Connection
> refused". At this point, just give up and make sure we get an error back.

Seems fine, queued, thanks.

Patch

diff --git a/tests/test-bad-pull.t b/tests/test-bad-pull.t
--- a/tests/test-bad-pull.t
+++ b/tests/test-bad-pull.t
@@ -1,14 +1,8 @@ 
 #require serve killdaemons
 
-#if windows
   $ hg clone http://localhost:$HGPORT/ copy
   abort: * (glob)
   [255]
-#else
-  $ hg clone http://localhost:$HGPORT/ copy
-  abort: error: Connection refused
-  [255]
-#endif
 
   $ test -d copy
   [1]
diff --git a/tests/test-static-http.t b/tests/test-static-http.t
--- a/tests/test-static-http.t
+++ b/tests/test-static-http.t
@@ -1,14 +1,8 @@ 
 #require killdaemons
 
-#if windows
   $ hg clone http://localhost:$HGPORT/ copy
   abort: * (glob)
   [255]
-#else
-  $ hg clone http://localhost:$HGPORT/ copy
-  abort: error: Connection refused
-  [255]
-#endif
   $ test -d copy
   [1]