Patchwork D1563: tests: use a regular expression to also accept FreeBSD version of error

login
register
mail settings
Submitter phabricator
Date Nov. 30, 2017, 4:19 p.m.
Message ID <differential-rev-PHID-DREV-bxmyawxie2cswulwyh7q-req@phab.mercurial-scm.org>
Download mbox | patch
Permalink /patch/25833/
State Superseded
Headers show

Comments

phabricator - Nov. 30, 2017, 4:19 p.m.
durin42 created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.

REVISION SUMMARY
  I suspect we'll have to relax this check even more for other OSes, but
  all we've got are the two working buildbots for the moment.

REPOSITORY
  rHG Mercurial

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

AFFECTED FILES
  tests/test-ssh.t

CHANGE DETAILS




To: durin42, #hg-reviewers
Cc: mercurial-devel
phabricator - Nov. 30, 2017, 9:07 p.m.
durin42 abandoned this revision.
durin42 added a comment.


  yuya had a better fix on the list I didn't notice when I sent this

REPOSITORY
  rHG Mercurial

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

To: durin42, #hg-reviewers
Cc: mercurial-devel

Patch

diff --git a/tests/test-ssh.t b/tests/test-ssh.t
--- a/tests/test-ssh.t
+++ b/tests/test-ssh.t
@@ -583,15 +583,15 @@ 
 
   $ hg pull ssh://brokenrepository
   pulling from ssh://brokenrepository/
-  remote: ssh: Could not resolve hostname brokenrepository: Name or service not known
+  remote: ssh: Could not resolve hostname brokenrepository: (Name or service|hostname nor servname provided, or) not known (re)
   abort: no suitable response from remote hg!
   [255]
 
 abort with configured error hint when there is a ssh problem when pulling
 
   $ hg pull ssh://brokenrepository --config ui.ssherrorhint="Please see http://company/internalwiki/ssh.html"
   pulling from ssh://brokenrepository/
-  remote: ssh: Could not resolve hostname brokenrepository: Name or service not known
+  remote: ssh: Could not resolve hostname brokenrepository: (Name or service|hostname nor servname provided, or) not known (re)
   abort: no suitable response from remote hg!
   (Please see http://company/internalwiki/ssh.html)
   [255]