This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8852

phabricator: unconditionally pop `test_vcr` from kwargs to fix debugcallconduit
ClosedPublic

Authored by Kwan on Jul 30 2020, 12:03 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHGb1f2659c1c34: phabricator: unconditionally pop `test_vcr` to fix debugcallconduit
Summary

11592ce6a711 / D8525 accidentally broke debugcallconduit in non-test scenarios
because it stopped popping test_vcr from kwargs unconditionally, so when
--test-vcr isn't set the empty string still gets passed down as the value of
test_vcr in kwargs. However unlike all the other commands debugcallconduit
doesn't have an **opts argument to receive it, so it aborts because of
invalid arguments.

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

Kwan created this revision.Jul 30 2020, 12:03 PM
pulkit accepted this revision.Jul 31 2020, 7:44 AM
This revision is now accepted and ready to land.Jul 31 2020, 7:44 AM

Revision Contents
Changeset List

PathPackages
Mhgext/phabricator.py (5 lines)
Mtests/test-phabricator.t (11 lines)

Diff 22161

hgext/phabricator.py

def sanitiseresponse(response): def sanitiseresponse(response):
if 'set-cookie' in response['headers']: if 'set-cookie' in response['headers']:
del response['headers']['set-cookie'] del response['headers']['set-cookie']
return response return response
def decorate(fn): def decorate(fn):
def inner(*args, **kwargs): def inner(*args, **kwargs):
if kwargs.get('test_vcr'): vcr = kwargs.pop('test_vcr')
cassette = pycompat.fsdecode(kwargs.pop('test_vcr')) if vcr:
cassette = pycompat.fsdecode(vcr)
import hgdemandimport import hgdemandimport
with hgdemandimport.deactivated(): with hgdemandimport.deactivated():
import vcr as vcrmod import vcr as vcrmod
import vcr.stubs as stubs import vcr.stubs as stubs
vcr = vcrmod.VCR( vcr = vcrmod.VCR(
serializer='json', serializer='json',

tests/test-phabricator.t

$ cd repo $ cd repo
$ cat >> .hg/hgrc <<EOF $ cat >> .hg/hgrc <<EOF
> [phabricator] > [phabricator]
> url = https://phab.mercurial-scm.org/ > url = https://phab.mercurial-scm.org/
> callsign = HG > callsign = HG
> EOF > EOF
$ VCR="$TESTDIR/phabricator" $ VCR="$TESTDIR/phabricator"
BROKEN: debugcallconduit fails without --test-vcr: debugcallconduit doesn't claim invalid arguments without --test-vcr:
$ echo '{}' | HGRCSKIPREPO= hg debugcallconduit 'conduit.ping' $ echo '{}' | HGRCSKIPREPO= hg debugcallconduit 'conduit.ping'
hg debugcallconduit: invalid arguments abort: config phabricator.url is required
hg debugcallconduit METHOD
call Conduit API
options:
(use 'hg debugcallconduit -h' to show more help)
[255] [255]
Error is handled reasonably. We override the phabtoken here so that Error is handled reasonably. We override the phabtoken here so that
when you're developing changes to phabricator.py you can edit the when you're developing changes to phabricator.py you can edit the
above config and have a real token in the test but not have to edit above config and have a real token in the test but not have to edit
this test. this test.
$ hg phabread --config auth.hgphab.phabtoken=cli-notavalidtoken \ $ hg phabread --config auth.hgphab.phabtoken=cli-notavalidtoken \
> --test-vcr "$VCR/phabread-conduit-error.json" D4480 | head > --test-vcr "$VCR/phabread-conduit-error.json" D4480 | head