This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10250

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

Authored by martinvonz on Mar 22 2021, 4:14 PM.

Details

Reviewers
mharbison72
Group Reviewers
hg-reviewers
Commits
rHGea8bfd33c22a: tests: replace some `python` by `"$PYTHON"` to not only use Python 2
Summary

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

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Revision Contents
Changeset List

PathPackages
Mtests/test-convert-cvs.t (2 lines)
Mtests/test-merge-tools.t (4 lines)

Diff 26552

tests/test-convert-cvs.t

|encoding |byte sequence | decodable as: | |encoding |byte sequence | decodable as: |
| | | utf-8 euc-jp cp932 | | | | utf-8 euc-jp cp932 |
+----------+--------------+--------------------+ +----------+--------------+--------------------+
|utf-8 |\xe3\x81\x82 | o x x | |utf-8 |\xe3\x81\x82 | o x x |
|euc-jp |\xa4\xa2 | x o o | |euc-jp |\xa4\xa2 | x o o |
|cp932 |\x82\xa0 | x x o | |cp932 |\x82\xa0 | x x o |
$ mkdir -p cvsrepo/transcoding $ mkdir -p cvsrepo/transcoding
$ python <<EOF $ "$PYTHON" <<EOF
> fp = open('cvsrepo/transcoding/file,v', 'wb') > fp = open('cvsrepo/transcoding/file,v', 'wb')
> fp.write((b''' > fp.write((b'''
> head 1.4; > head 1.4;
> access; > access;
> symbols > symbols
> start:1.1.1.1 INITIAL:1.1.1; > start:1.1.1.1 INITIAL:1.1.1;
> locks; strict; > locks; strict;
> comment @# @; > comment @# @;

tests/test-merge-tools.t

merging f and f.txt to f.txt merging f and f.txt to f.txt
$TESTTMP/hgmerge.*/f~base $TESTTMP/hgmerge.*/f~local.txt $TESTTMP/hgmerge.*/f~other.txt $TESTTMP/repo/f.txt (glob) $TESTTMP/hgmerge.*/f~base $TESTTMP/hgmerge.*/f~local.txt $TESTTMP/hgmerge.*/f~other.txt $TESTTMP/repo/f.txt (glob)
0 files updated, 1 files merged, 0 files removed, 0 files unresolved 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit) (branch merge, don't forget to commit)
Binary files capability checking Binary files capability checking
$ hg update -q -C 0 $ hg update -q -C 0
$ python <<EOF $ "$PYTHON" <<EOF
> with open('b', 'wb') as fp: > with open('b', 'wb') as fp:
> fp.write(b'\x00\x01\x02\x03') > fp.write(b'\x00\x01\x02\x03')
> EOF > EOF
$ hg add b $ hg add b
$ hg commit -qm "add binary file (#1)" $ hg commit -qm "add binary file (#1)"
$ hg update -q -C 0 $ hg update -q -C 0
$ python <<EOF $ "$PYTHON" <<EOF
> with open('b', 'wb') as fp: > with open('b', 'wb') as fp:
> fp.write(b'\x03\x02\x01\x00') > fp.write(b'\x03\x02\x01\x00')
> EOF > EOF
$ hg add b $ hg add b
$ hg commit -qm "add binary file (#2)" $ hg commit -qm "add binary file (#2)"
By default, binary files capability of internal merge tools is not By default, binary files capability of internal merge tools is not
checked strictly. checked strictly.