This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9463

tests: conditionalize return code on chg in test-config.t
ClosedPublic

Authored by pulkit on Nov 30 2020, 4:42 AM.

Details

Reviewers
mharbison72
Group Reviewers
hg-reviewers
Commits
rHG60523483897c: tests: conditionalize return code on chg in test-config.t
Summary

If there is any error while reading config, chg just returns 255 instead of 30.

It seems to me that we cannot conditionalize only return codes in output using
trailing (chg !) and hence used testcases.

The test was failing with chg but after this patch, it now passes.

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.

Event Timeline

pulkit created this revision.Nov 30 2020, 4:42 AM
marmoute added a subscriber: marmoute.Nov 30 2020, 4:48 AM

Why do we have a different return code than the non-chg code ?

pulkit added a comment.Nov 30 2020, 4:56 AM
In D9463#142295, @marmoute wrote:

Why do we have a different return code than the non-chg code ?

While loading the UI, if some error happens, chg returns 255 and does not follow the return code from dispatch.*. Actually chg needs to be upgraded to fine-grained error handling and return codes as right now it's not obvious which error we are catching as we just use except error.Abort.

mharbison72 accepted this revision.Dec 1 2020, 6:35 PM
mharbison72 added a subscriber: mharbison72.

Queued 1 and 3, thanks

This revision is now accepted and ready to land.Dec 1 2020, 6:35 PM
pulkit added a commit: rHG60523483897c: tests: conditionalize return code on chg in test-config.t.Dec 1 2020, 6:38 PM
Closed by commit rHG60523483897c: tests: conditionalize return code on chg in test-config.t (authored by pulkit). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mtests/test-config.t (24 lines)

Diff 23920

tests/test-config.t

hide outer repo hide outer repo
$ hg init $ hg init
Invalid syntax: no value Invalid syntax: no value
$ cat > .hg/hgrc << EOF $ cat > .hg/hgrc << EOF
> novaluekey > novaluekey
> EOF > EOF
#if chg
$ hg showconfig
config error at $TESTTMP/.hg/hgrc:1: novaluekey
[255]
#else
$ hg showconfig $ hg showconfig
config error at $TESTTMP/.hg/hgrc:1: novaluekey config error at $TESTTMP/.hg/hgrc:1: novaluekey
[30] [30]
#endif
Invalid syntax: no key Invalid syntax: no key
$ cat > .hg/hgrc << EOF $ cat > .hg/hgrc << EOF
> =nokeyvalue > =nokeyvalue
> EOF > EOF
#if chg
$ hg showconfig
config error at $TESTTMP/.hg/hgrc:1: =nokeyvalue
[255]
#else
$ hg showconfig $ hg showconfig
config error at $TESTTMP/.hg/hgrc:1: =nokeyvalue config error at $TESTTMP/.hg/hgrc:1: =nokeyvalue
[30] [30]
#endif
Test hint about invalid syntax from leading white space Test hint about invalid syntax from leading white space
$ cat > .hg/hgrc << EOF $ cat > .hg/hgrc << EOF
> key=value > key=value
> EOF > EOF
#if chg
$ hg showconfig
config error at $TESTTMP/.hg/hgrc:1: unexpected leading whitespace: key=value
[255]
#else
$ hg showconfig $ hg showconfig
config error at $TESTTMP/.hg/hgrc:1: unexpected leading whitespace: key=value config error at $TESTTMP/.hg/hgrc:1: unexpected leading whitespace: key=value
[30] [30]
#endif
$ cat > .hg/hgrc << EOF $ cat > .hg/hgrc << EOF
> [section] > [section]
> key=value > key=value
> EOF > EOF
#if chg
$ hg showconfig
config error at $TESTTMP/.hg/hgrc:1: unexpected leading whitespace: [section]
[255]
#else
$ hg showconfig $ hg showconfig
config error at $TESTTMP/.hg/hgrc:1: unexpected leading whitespace: [section] config error at $TESTTMP/.hg/hgrc:1: unexpected leading whitespace: [section]
[30] [30]
#endif
Reset hgrc Reset hgrc
$ echo > .hg/hgrc $ echo > .hg/hgrc
Test case sensitive configuration Test case sensitive configuration
$ cat <<EOF >> $HGRCPATH $ cat <<EOF >> $HGRCPATH