Patchwork tests: update regex check for fetch error in test-clonebundles.t

login
register
mail settings
Submitter Denis Laxalde
Date June 22, 2017, 11:20 a.m.
Message ID <c5ead6e33b3fcc82f860.1498130451@marimba>
Download mbox | patch
Permalink /patch/21608/
State Accepted
Headers show

Comments

Denis Laxalde - June 22, 2017, 11:20 a.m.
# HG changeset patch
# User Denis Laxalde <denis@laxalde.org>
# Date 1498122989 -7200
#      Thu Jun 22 11:16:29 2017 +0200
# Node ID c5ead6e33b3fcc82f860c6b241b451ff025ec3a0
# Parent  41b081ac2145d88ba1fe494630ce69652f016078
tests: update regex check for fetch error in test-clonebundles.t

On some systems, e.g. Docker container, the actual error may be:

  error fetching bundle: [Errno 99] Cannot assign requested address

Update the regex to handle this case.
Yuya Nishihara - June 23, 2017, 2:05 p.m.
On Thu, 22 Jun 2017 13:20:51 +0200, Denis Laxalde wrote:
> # HG changeset patch
> # User Denis Laxalde <denis@laxalde.org>
> # Date 1498122989 -7200
> #      Thu Jun 22 11:16:29 2017 +0200
> # Node ID c5ead6e33b3fcc82f860c6b241b451ff025ec3a0
> # Parent  41b081ac2145d88ba1fe494630ce69652f016078
> tests: update regex check for fetch error in test-clonebundles.t

Queued, thanks.

Patch

diff --git a/tests/test-clonebundles.t b/tests/test-clonebundles.t
--- a/tests/test-clonebundles.t
+++ b/tests/test-clonebundles.t
@@ -62,7 +62,7 @@  Server is not running aborts
   $ 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|(.* )?Cannot assign requested address) (re)
   abort: error applying bundle
   (if this error persists, consider contacting the server operator or disable clone bundles via "--config ui.clonebundles=false")
   [255]