From patchwork Sat Jun 16 11:06:09 2018
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: [3,of,8] py3: glob out some error messages in test-fileset.t
From: Yuya Nishihara <yuya@tcha.org>
X-Patchwork-Id: 32189
Message-Id: <f13276ec9109d1b428c1.1529147169@mimosa>
To: mercurial-devel@mercurial-scm.org
Date: Sat, 16 Jun 2018 20:06:09 +0900

# HG changeset patch
# User Yuya Nishihara <yuya@tcha.org>
# Date 1529136243 -32400
#      Sat Jun 16 17:04:03 2018 +0900
# Node ID f13276ec9109d1b428c14e638d0f2b35f484291e
# Parent  63809ae9c19bbec2df4bed0003d2347ddf5c3ea1
py3: glob out some error messages in test-fileset.t

Python3 provides more detailed messages, which is fine.

diff --git a/contrib/python3-whitelist b/contrib/python3-whitelist
--- a/contrib/python3-whitelist
+++ b/contrib/python3-whitelist
@@ -159,6 +159,7 @@ test-filebranch.t
 test-filecache.py
 test-filelog.py
 test-fileset-generated.t
+test-fileset.t
 test-fix-topology.t
 test-flags.t
 test-generaldelta.t
diff --git a/tests/test-fileset.t b/tests/test-fileset.t
--- a/tests/test-fileset.t
+++ b/tests/test-fileset.t
@@ -68,7 +68,7 @@ Test operators and basic patterns
   a2
   $ fileset 'a_b'
   $ fileset '"\xy"'
-  hg: parse error: invalid \x escape
+  hg: parse error: invalid \x escape* (glob)
   [255]
 
 Test invalid syntax
@@ -196,7 +196,7 @@ Test files properties
   c1
   b1
   $ fileset 'grep("missingparens(")'
-  hg: parse error: invalid match pattern: unbalanced parenthesis
+  hg: parse error: invalid match pattern: (unbalanced parenthesis|missing \)).* (re)
   [255]
 
 #if execbit