Patchwork D5412: test: fix test-http-bad-server with current python 2.7

login
register
mail settings
Submitter phabricator
Date Dec. 12, 2018, 12:25 p.m.
Message ID <79b447b95284ba54876d33859c19a090@localhost.localdomain>
Download mbox | patch
Permalink /patch/37119/
State Not Applicable
Headers show

Comments

phabricator - Dec. 12, 2018, 12:25 p.m.
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG21f5810df848: test: fix test-http-bad-server with current python 2.7 (authored by jcristau, committed by ).

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D5412?vs=12824&id=12825

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

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

CHANGE DETAILS




To: jcristau, #hg-reviewers
Cc: yuja, mercurial-devel

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
@@ -69,7 +69,7 @@ 
   $ cat hg.pid > $DAEMON_PIDS
 
   $ hg clone http://localhost:$HGPORT/ clone
-  abort: error: bad HTTP status line: ''
+  abort: error: bad HTTP status line: * (glob)
   [255]
 
   $ killdaemons.py $DAEMON_PIDS
@@ -85,7 +85,7 @@ 
   $ hg serve --config badserver.closeafterrecvbytes=40 -p $HGPORT -d --pid-file=hg.pid -E error.log
   $ cat hg.pid > $DAEMON_PIDS
   $ hg clone http://localhost:$HGPORT/ clone
-  abort: error: bad HTTP status line: ''
+  abort: error: bad HTTP status line: * (glob)
   [255]
 
   $ killdaemons.py $DAEMON_PIDS
@@ -102,7 +102,7 @@ 
   $ hg serve --config badserver.closeafterrecvbytes=210,223 -p $HGPORT -d --pid-file=hg.pid -E error.log
   $ cat hg.pid > $DAEMON_PIDS
   $ hg clone http://localhost:$HGPORT/ clone
-  abort: error: bad HTTP status line: ''
+  abort: error: bad HTTP status line: * (glob)
   [255]
 
   $ killdaemons.py $DAEMON_PIDS
@@ -141,7 +141,7 @@ 
   $ cat hg.pid > $DAEMON_PIDS
   $ hg clone http://localhost:$HGPORT/ clone
   requesting all changes
-  abort: error: bad HTTP status line: ''
+  abort: error: bad HTTP status line: * (glob)
   [255]
 
   $ killdaemons.py $DAEMON_PIDS
@@ -200,7 +200,7 @@ 
   $ cat hg.pid > $DAEMON_PIDS
 
   $ hg clone http://localhost:$HGPORT/ clone
-  abort: error: bad HTTP status line: ''
+  abort: error: bad HTTP status line: * (glob)
   [255]
 
   $ killdaemons.py $DAEMON_PIDS