Patchwork test-clonebundles: accept another error string here

login
register
mail settings
Submitter Augie Fackler
Date Aug. 25, 2016, 5:13 a.m.
Message ID <2c715c771805cbb9f18d.1472102035@imladris.local>
Download mbox | patch
Permalink /patch/16409/
State Accepted
Headers show

Comments

Augie Fackler - Aug. 25, 2016, 5:13 a.m.
# HG changeset patch
# User Augie Fackler <augie@google.com>
# Date 1472101592 14400
#      Thu Aug 25 01:06:32 2016 -0400
# Node ID 2c715c771805cbb9f18d8c6d787d9f62b08d4bfb
# Parent  41ea8c9ce0113031f5129b8c0ab377cae71f6a2d
test-clonebundles: accept another error string here

This is what happens if you run the test in a FreeBSD Jail, rather
than "connection refused".
Pierre-Yves David - Aug. 25, 2016, 10:19 a.m.
On 08/25/2016 07:13 AM, Augie Fackler wrote:
> # HG changeset patch
> # User Augie Fackler <augie@google.com>
> # Date 1472101592 14400
> #      Thu Aug 25 01:06:32 2016 -0400
> # Node ID 2c715c771805cbb9f18d8c6d787d9f62b08d4bfb
> # Parent  41ea8c9ce0113031f5129b8c0ab377cae71f6a2d
> test-clonebundles: accept another error string here

Pushed thanks.

Patch

diff --git a/tests/test-clonebundles.t b/tests/test-clonebundles.t
--- a/tests/test-clonebundles.t
+++ b/tests/test-clonebundles.t
@@ -61,7 +61,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* (glob)
+  error fetching bundle: (.* refused.*|Protocol not supported) (re)
   abort: error applying bundle
   (if this error persists, consider contacting the server operator or disable clone bundles via "--config ui.clonebundles=false")
   [255]