From patchwork Thu Oct 18 12:33:00 2018
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: [9,of,9] py3: get around IOError variants in test-commandserver.t
From: Yuya Nishihara <yuya@tcha.org>
X-Patchwork-Id: 36141
Message-Id: <17abd7febf13b99845f0.1539865980@mimosa>
To: mercurial-devel@mercurial-scm.org
Date: Thu, 18 Oct 2018 21:33:00 +0900

# HG changeset patch
# User Yuya Nishihara <yuya@tcha.org>
# Date 1539672503 -7200
#      Tue Oct 16 08:48:23 2018 +0200
# Node ID 17abd7febf13b99845f0305e92cfa6e321810a99
# Parent  570e96ab987597acf146a6636f11f70494413745
py3: get around IOError variants in test-commandserver.t

diff --git a/contrib/python3-whitelist b/contrib/python3-whitelist
--- a/contrib/python3-whitelist
+++ b/contrib/python3-whitelist
@@ -78,6 +78,7 @@ test-clone-update-order.t
 test-clone.t
 test-clonebundles.t
 test-close-head.t
+test-commandserver.t
 test-commit-amend.t
 test-commit-interactive.t
 test-commit-multiple.t
diff --git a/tests/test-commandserver.t b/tests/test-commandserver.t
--- a/tests/test-commandserver.t
+++ b/tests/test-commandserver.t
@@ -793,13 +793,13 @@ unix domain socket:
   ...             break
   >>> check(earlycrash, server.connect)
   e, 'Traceback (most recent call last):\n'
-  e, "IOError: *" (glob)
+  e, "(IOError|FileNotFoundError): .*" (re)
   >>> server.shutdown()
 
   $ cat .hg/server.log | grep -v '^  '
   listening at .hg/server.sock
   Traceback (most recent call last):
-  IOError: * (glob)
+  (IOError|FileNotFoundError): .* (re)
   killed!
 #endif
 #if no-unix-socket