Patchwork D10250: tests: replace some `python` by `"$PYTHON"` to not only use Python 2

login
register
mail settings
Submitter phabricator
Date March 22, 2021, 8:14 p.m.
Message ID <differential-rev-PHID-DREV-mysbv6ooq4nxw4z4n32b-req@mercurial-scm.org>
Download mbox | patch
Permalink /patch/48566/
State Superseded
Headers show

Comments

phabricator - March 22, 2021, 8:14 p.m.
martinvonz created this revision.
Herald added a reviewer: hg-reviewers.
Herald added a subscriber: mercurial-patches.

REVISION SUMMARY
  I deleted my `python` binary as a test and a few tests started
  failing.

REPOSITORY
  rHG Mercurial

BRANCH
  default

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

AFFECTED FILES
  tests/test-convert-cvs.t
  tests/test-merge-tools.t

CHANGE DETAILS




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

Patch

diff --git a/tests/test-merge-tools.t b/tests/test-merge-tools.t
--- a/tests/test-merge-tools.t
+++ b/tests/test-merge-tools.t
@@ -1921,7 +1921,7 @@ 
 Binary files capability checking
 
   $ hg update -q -C 0
-  $ python <<EOF
+  $ "$PYTHON" <<EOF
   > with open('b', 'wb') as fp:
   >     fp.write(b'\x00\x01\x02\x03')
   > EOF
@@ -1929,7 +1929,7 @@ 
   $ hg commit -qm "add binary file (#1)"
 
   $ hg update -q -C 0
-  $ python <<EOF
+  $ "$PYTHON" <<EOF
   > with open('b', 'wb') as fp:
   >     fp.write(b'\x03\x02\x01\x00')
   > EOF
diff --git a/tests/test-convert-cvs.t b/tests/test-convert-cvs.t
--- a/tests/test-convert-cvs.t
+++ b/tests/test-convert-cvs.t
@@ -521,7 +521,7 @@ 
 |cp932     |\x82\xa0      |  x      x     o    |
 
   $ mkdir -p cvsrepo/transcoding
-  $ python <<EOF
+  $ "$PYTHON" <<EOF
   > fp = open('cvsrepo/transcoding/file,v', 'wb')
   > fp.write((b'''
   > head	1.4;