( )⚙ D4973 tests: use baseurl instead of advertisedbaseurl

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4973

tests: use baseurl instead of advertisedbaseurl
ClosedPublic

Authored by indygreg on Oct 12 2018, 4:13 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGf7ff5b4fe745: tests: use baseurl instead of advertisedbaseurl
Summary

The distinction matters for e.g. hosts behind load balancers. But for
the test environment, it doesn't matter.

For whatever reason, advertisedbaseurl is resolving to
http://1.0.0.127.in-addr.arpa:$HGPORT on my MBP. This hostname fails
to resolve, causing the test to fail. No clue what's up with that
behavior.

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

indygreg created this revision.Oct 12 2018, 4:13 AM
Closed by commit rHGf7ff5b4fe745: tests: use baseurl instead of advertisedbaseurl (authored by indygreg). · Explain WhyOct 12 2018, 11:15 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mtests/wireprotosimplecache.py (2 lines)

Diff 11880

tests/wireprotosimplecache.py

if not clienttargets & ourtargets: if not clienttargets & ourtargets:
redirectable = False redirectable = False
if redirectable: if redirectable:
paths = self.req.dispatchparts[:-3] paths = self.req.dispatchparts[:-3]
paths.append(b'simplecache') paths.append(b'simplecache')
paths.append(self.key) paths.append(self.key)
url = b'%s/%s' % (self.req.advertisedbaseurl, b'/'.join(paths)) url = b'%s/%s' % (self.req.baseurl, b'/'.join(paths))
#url = b'http://example.com/%s' % self.key #url = b'http://example.com/%s' % self.key
self.ui.log('simplecache', 'sending content redirect for %s to ' self.ui.log('simplecache', 'sending content redirect for %s to '
'%s\n', self.key, url) '%s\n', self.key, url)
response = wireprototypes.alternatelocationresponse( response = wireprototypes.alternatelocationresponse(
url=url, url=url,
mediatype=b'application/mercurial-cbor') mediatype=b'application/mercurial-cbor')