From patchwork Sat Jun 13 09:07:39 2020
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: D8630: tests: adjust to the new format in pyflakes output
From: phabricator <phabricator@mercurial-scm.org>
X-Patchwork-Id: 46500
Message-Id: <differential-rev-PHID-DREV-4vmocpfdunoqaqgyaljc-req@mercurial-scm.org>
To: Phabricator <phabricator@mercurial-scm.org>
Cc: mercurial-devel@mercurial-scm.org
Date: Sat, 13 Jun 2020 09:07:39 +0000

marmoute created this revision.
Herald added a reviewer: hg-reviewers.
Herald added a subscriber: mercurial-patches.

REVISION SUMMARY
  According to the pyflakes' NEWS.rst, the default output format changed
  recently:
  
    2.2.0 (2020-04-08)
    - Include column information in error messages
  
  So the lines now read:
  
    contrib/perf.py:149:15 undefined name 'xrange'
    mercurial/hgweb/server.py:427:13 undefined name 'reload'
    mercurial/util.py:2862:24 undefined name 'file'
  
  This is a graft of a similar fix that ended up on default.

REPOSITORY
  rHG Mercurial

BRANCH
  stable

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

AFFECTED FILES
  tests/test-check-pyflakes.t

CHANGE DETAILS




To: marmoute, #hg-reviewers
Cc: mercurial-patches, mercurial-devel

diff --git a/tests/test-check-pyflakes.t b/tests/test-check-pyflakes.t
--- a/tests/test-check-pyflakes.t
+++ b/tests/test-check-pyflakes.t
@@ -9,7 +9,7 @@
   > print(undefinedname)
   > EOF
   $ $PYTHON -m pyflakes test.py 2>/dev/null | "$TESTDIR/filterpyflakes.py"
-  test.py:1: undefined name 'undefinedname'
+  test.py:1:* undefined name 'undefinedname' (glob)
   
   $ cd "`dirname "$TESTDIR"`"
 
@@ -19,8 +19,8 @@
   > -X mercurial/thirdparty \
   > 2>/dev/null \
   > | xargs $PYTHON -m pyflakes 2>/dev/null | "$TESTDIR/filterpyflakes.py"
-  contrib/perf.py:*: undefined name 'xrange' (glob) (?)
-  mercurial/hgweb/server.py:*: undefined name 'reload' (glob) (?)
-  mercurial/util.py:*: undefined name 'file' (glob) (?)
-  mercurial/encoding.py:*: undefined name 'localstr' (glob) (?)
+  contrib/perf.py:*:* undefined name 'xrange' (glob) (?)
+  mercurial/hgweb/server.py:*:* undefined name 'reload' (glob) (?)
+  mercurial/util.py:*:* undefined name 'file' (glob) (?)
+  mercurial/encoding.py:*:* undefined name 'localstr' (glob) (?)