Patchwork [4,of,4] test-clonebundles: conditionalize output for Windows

login
register
mail settings
Submitter Matt Harbison
Date June 5, 2017, 3:38 a.m.
Message ID <29a0d44ddc063f1dd24f.1496633931@Envy>
Download mbox | patch
Permalink /patch/21205/
State Accepted
Headers show

Comments

Matt Harbison - June 5, 2017, 3:38 a.m.
# HG changeset patch
# User Matt Harbison <matt_harbison@yahoo.com>
# Date 1496623052 14400
#      Sun Jun 04 20:37:32 2017 -0400
# Node ID 29a0d44ddc063f1dd24f21ce193be0a866d8c116
# Parent  cd84d2ed17926b8de886d3d2719a4fa3c7440af0
test-clonebundles: conditionalize output for Windows

This was the fallout from 9d6031df42c8 (on stable).  Now that individual lines
can be conditionalized, it seems better to be explicit, rather than mash all of
this into one regex.  "getaddrinfo failed" was added in 4e566f513fd8 to support
Windows.
Augie Fackler - June 5, 2017, 2:09 p.m.
On Sun, Jun 04, 2017 at 11:38:51PM -0400, Matt Harbison wrote:
> # HG changeset patch
> # User Matt Harbison <matt_harbison@yahoo.com>
> # Date 1496623052 14400
> #      Sun Jun 04 20:37:32 2017 -0400
> # Node ID 29a0d44ddc063f1dd24f21ce193be0a866d8c116
> # Parent  cd84d2ed17926b8de886d3d2719a4fa3c7440af0
> test-clonebundles: conditionalize output for Windows

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
@@ -51,7 +51,8 @@ 
   $ echo 'http://does.not.exist/bundle.hg' > server/.hg/clonebundles.manifest
   $ hg clone http://localhost:$HGPORT 404-url
   applying clone bundle from http://does.not.exist/bundle.hg
-  error fetching bundle: (.* not known|getaddrinfo failed|No address associated with hostname) (re)
+  error fetching bundle: (.* not known|No address associated with hostname) (re) (no-windows !)
+  error fetching bundle: [Errno 11004] getaddrinfo failed (windows !)
   abort: error applying bundle
   (if this error persists, consider contacting the server operator or disable clone bundles via "--config ui.clonebundles=false")
   [255]