Patchwork [2,of,3] test-http-bad-server: conditionalize error output for Windows

login
register
mail settings
Submitter Matt Harbison
Date April 17, 2017, 1:35 a.m.
Message ID <86304ad8bca815fb293c.1492392959@Envy>
Download mbox | patch
Permalink /patch/20244/
State Accepted
Headers show

Comments

Matt Harbison - April 17, 2017, 1:35 a.m.
# HG changeset patch
# User Matt Harbison <matt_harbison@yahoo.com>
# Date 1492390822 14400
#      Sun Apr 16 21:00:22 2017 -0400
# Node ID 86304ad8bca815fb293c88f5baaab089bac1cc31
# Parent  85faa957af5a8aad904fdadaf38e1b0de366ed2c
test-http-bad-server: conditionalize error output for Windows

Patch

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
@@ -34,7 +34,8 @@ 
   $ cat hg.pid > $DAEMON_PIDS
 
   $ hg clone http://localhost:$HGPORT/ clone
-  abort: error: Connection reset by peer
+  abort: error: Connection reset by peer (no-windows !)
+  abort: error: An existing connection was forcibly closed by the remote host (windows !)
   [255]
 
 (The server exits on its own, but there is a race between that and starting a new server.
@@ -48,7 +49,8 @@ 
   $ cat hg.pid > $DAEMON_PIDS
 
   $ hg clone http://localhost:$HGPORT/ clone
-  abort: error: Connection reset by peer
+  abort: error: Connection reset by peer (no-windows !)
+  abort: error: An existing connection was forcibly closed by the remote host (windows !)
   [255]
 
   $ killdaemons.py $DAEMON_PIDS