This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3529

tests: use stringutil.pprint instead of custom dumper in test-hgweb-auth.py
ClosedPublic

Authored by durin42 on May 10 2018, 11:16 AM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG31c37e703cee: tests: use stringutil.pprint instead of custom dumper in test-hgweb-auth.py
rHG051792681cd4: tests: use stringutil.pprint instead of custom dumper in test-hgweb-auth.py
rHG4d29543cc1e0: tests: use stringutil.pprint instead of custom dumper in test-hgweb-auth.py
Summary

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

durin42 created this revision.May 10 2018, 11:16 AM
pulkit accepted this revision.May 10 2018, 11:36 AM
Closed by commit rHG4d29543cc1e0: tests: use stringutil.pprint instead of custom dumper in test-hgweb-auth.py (authored by durin42). · Explain WhyMay 10 2018, 2:47 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mtests/test-hgweb-auth.py (10 lines)
Mtests/test-hgweb-auth.py.out (26 lines)

Diff 8623

tests/test-hgweb-auth.py

from __future__ import absolute_import, print_function from __future__ import absolute_import, print_function
from mercurial import demandimport; demandimport.enable() from mercurial import demandimport; demandimport.enable()
from mercurial import ( from mercurial import (
error, error,
pycompat,
ui as uimod, ui as uimod,
url, url,
util, util,
) )
from mercurial.utils import (
stringutil,
)
urlerr = util.urlerr urlerr = util.urlerr
urlreq = util.urlreq urlreq = util.urlreq
class myui(uimod.ui): class myui(uimod.ui):
def interactive(self): def interactive(self):
return False return False
origui = myui.load() origui = myui.load()
def writeauth(items): def writeauth(items):
ui = origui.copy() ui = origui.copy()
for name, value in items.items(): for name, value in items.items():
ui.setconfig('auth', name, value) ui.setconfig('auth', name, value)
return ui return ui
def dumpdict(dict):
return '{' + ', '.join(['%s: %s' % (k, dict[k])
for k in sorted(dict)]) + '}'
def test(auth, urls=None): def test(auth, urls=None):
print('CFG:', dumpdict(auth)) print('CFG:', pycompat.sysstr(stringutil.pprint(auth)))
prefixes = set() prefixes = set()
for k in auth: for k in auth:
prefixes.add(k.split('.', 1)[0]) prefixes.add(k.split('.', 1)[0])
for p in prefixes: for p in prefixes:
for name in ('.username', '.password'): for name in ('.username', '.password'):
if (p + name) not in auth: if (p + name) not in auth:
auth[p + name] = p auth[p + name] = p
auth = dict((k, v) for k, v in auth.items() if v is not None) auth = dict((k, v) for k, v in auth.items() if v is not None)

tests/test-hgweb-auth.py.out

*** Test in-uri schemes *** Test in-uri schemes
CFG: {x.prefix: http://example.org} CFG: {b'x.prefix': b'http://example.org'}
URI: http://example.org/foo URI: http://example.org/foo
('x', 'x') ('x', 'x')
URI: http://example.org/foo/bar URI: http://example.org/foo/bar
('x', 'x') ('x', 'x')
URI: http://example.org/bar URI: http://example.org/bar
('x', 'x') ('x', 'x')
URI: https://example.org/foo URI: https://example.org/foo
abort abort
URI: https://example.org/foo/bar URI: https://example.org/foo/bar
abort abort
URI: https://example.org/bar URI: https://example.org/bar
abort abort
URI: https://x@example.org/bar URI: https://x@example.org/bar
abort abort
URI: https://y@example.org/bar URI: https://y@example.org/bar
abort abort
CFG: {x.prefix: https://example.org} CFG: {b'x.prefix': b'https://example.org'}
URI: http://example.org/foo URI: http://example.org/foo
abort abort
URI: http://example.org/foo/bar URI: http://example.org/foo/bar
abort abort
URI: http://example.org/bar URI: http://example.org/bar
abort abort
URI: https://example.org/foo URI: https://example.org/foo
('x', 'x') ('x', 'x')
URI: https://example.org/foo/bar URI: https://example.org/foo/bar
('x', 'x') ('x', 'x')
URI: https://example.org/bar URI: https://example.org/bar
('x', 'x') ('x', 'x')
URI: https://x@example.org/bar URI: https://x@example.org/bar
('x', 'x') ('x', 'x')
URI: https://y@example.org/bar URI: https://y@example.org/bar
abort abort
CFG: {x.prefix: http://example.org, x.schemes: https} CFG: {b'x.prefix': b'http://example.org', b'x.schemes': b'https'}
URI: http://example.org/foo URI: http://example.org/foo
('x', 'x') ('x', 'x')
URI: http://example.org/foo/bar URI: http://example.org/foo/bar
('x', 'x') ('x', 'x')
URI: http://example.org/bar URI: http://example.org/bar
('x', 'x') ('x', 'x')
URI: https://example.org/foo URI: https://example.org/foo
abort abort
URI: https://example.org/foo/bar URI: https://example.org/foo/bar
abort abort
URI: https://example.org/bar URI: https://example.org/bar
abort abort
URI: https://x@example.org/bar URI: https://x@example.org/bar
abort abort
URI: https://y@example.org/bar URI: https://y@example.org/bar
abort abort
CFG: {x.prefix: https://example.org, x.schemes: http} CFG: {b'x.prefix': b'https://example.org', b'x.schemes': b'http'}
URI: http://example.org/foo URI: http://example.org/foo
abort abort
URI: http://example.org/foo/bar URI: http://example.org/foo/bar
abort abort
URI: http://example.org/bar URI: http://example.org/bar
abort abort
URI: https://example.org/foo URI: https://example.org/foo
('x', 'x') ('x', 'x')
URI: https://example.org/foo/bar URI: https://example.org/foo/bar
('x', 'x') ('x', 'x')
URI: https://example.org/bar URI: https://example.org/bar
('x', 'x') ('x', 'x')
URI: https://x@example.org/bar URI: https://x@example.org/bar
('x', 'x') ('x', 'x')
URI: https://y@example.org/bar URI: https://y@example.org/bar
abort abort
*** Test separately configured schemes *** Test separately configured schemes
CFG: {x.prefix: example.org, x.schemes: http} CFG: {b'x.prefix': b'example.org', b'x.schemes': b'http'}
URI: http://example.org/foo URI: http://example.org/foo
('x', 'x') ('x', 'x')
URI: http://example.org/foo/bar URI: http://example.org/foo/bar
('x', 'x') ('x', 'x')
URI: http://example.org/bar URI: http://example.org/bar
('x', 'x') ('x', 'x')
URI: https://example.org/foo URI: https://example.org/foo
abort abort
URI: https://example.org/foo/bar URI: https://example.org/foo/bar
abort abort
URI: https://example.org/bar URI: https://example.org/bar
abort abort
URI: https://x@example.org/bar URI: https://x@example.org/bar
abort abort
URI: https://y@example.org/bar URI: https://y@example.org/bar
abort abort
CFG: {x.prefix: example.org, x.schemes: https} CFG: {b'x.prefix': b'example.org', b'x.schemes': b'https'}
URI: http://example.org/foo URI: http://example.org/foo
abort abort
URI: http://example.org/foo/bar URI: http://example.org/foo/bar
abort abort
URI: http://example.org/bar URI: http://example.org/bar
abort abort
URI: https://example.org/foo URI: https://example.org/foo
('x', 'x') ('x', 'x')
URI: https://example.org/foo/bar URI: https://example.org/foo/bar
('x', 'x') ('x', 'x')
URI: https://example.org/bar URI: https://example.org/bar
('x', 'x') ('x', 'x')
URI: https://x@example.org/bar URI: https://x@example.org/bar
('x', 'x') ('x', 'x')
URI: https://y@example.org/bar URI: https://y@example.org/bar
abort abort
CFG: {x.prefix: example.org, x.schemes: http https} CFG: {b'x.prefix': b'example.org', b'x.schemes': b'http https'}
URI: http://example.org/foo URI: http://example.org/foo
('x', 'x') ('x', 'x')
URI: http://example.org/foo/bar URI: http://example.org/foo/bar
('x', 'x') ('x', 'x')
URI: http://example.org/bar URI: http://example.org/bar
('x', 'x') ('x', 'x')
URI: https://example.org/foo URI: https://example.org/foo
('x', 'x') ('x', 'x')
URI: https://example.org/foo/bar URI: https://example.org/foo/bar
('x', 'x') ('x', 'x')
URI: https://example.org/bar URI: https://example.org/bar
('x', 'x') ('x', 'x')
URI: https://x@example.org/bar URI: https://x@example.org/bar
('x', 'x') ('x', 'x')
URI: https://y@example.org/bar URI: https://y@example.org/bar
abort abort
*** Test prefix matching *** Test prefix matching
CFG: {x.prefix: http://example.org/foo, y.prefix: http://example.org/bar} CFG: {b'x.prefix': b'http://example.org/foo', b'y.prefix': b'http://example.org/bar'}
URI: http://example.org/foo URI: http://example.org/foo
('x', 'x') ('x', 'x')
URI: http://example.org/foo/bar URI: http://example.org/foo/bar
('x', 'x') ('x', 'x')
URI: http://example.org/bar URI: http://example.org/bar
('y', 'y') ('y', 'y')
URI: https://example.org/foo URI: https://example.org/foo
abort abort
URI: https://example.org/foo/bar URI: https://example.org/foo/bar
abort abort
URI: https://example.org/bar URI: https://example.org/bar
abort abort
URI: https://x@example.org/bar URI: https://x@example.org/bar
abort abort
URI: https://y@example.org/bar URI: https://y@example.org/bar
abort abort
CFG: {x.prefix: http://example.org/foo, y.prefix: http://example.org/foo/bar} CFG: {b'x.prefix': b'http://example.org/foo', b'y.prefix': b'http://example.org/foo/bar'}
URI: http://example.org/foo URI: http://example.org/foo
('x', 'x') ('x', 'x')
URI: http://example.org/foo/bar URI: http://example.org/foo/bar
('y', 'y') ('y', 'y')
URI: http://example.org/bar URI: http://example.org/bar
abort abort
URI: https://example.org/foo URI: https://example.org/foo
abort abort
URI: https://example.org/foo/bar URI: https://example.org/foo/bar
abort abort
URI: https://example.org/bar URI: https://example.org/bar
abort abort
URI: https://x@example.org/bar URI: https://x@example.org/bar
abort abort
URI: https://y@example.org/bar URI: https://y@example.org/bar
abort abort
CFG: {x.prefix: *, y.prefix: https://example.org/bar} CFG: {b'x.prefix': b'*', b'y.prefix': b'https://example.org/bar'}
URI: http://example.org/foo URI: http://example.org/foo
abort abort
URI: http://example.org/foo/bar URI: http://example.org/foo/bar
abort abort
URI: http://example.org/bar URI: http://example.org/bar
abort abort
URI: https://example.org/foo URI: https://example.org/foo
('x', 'x') ('x', 'x')
URI: https://example.org/foo/bar URI: https://example.org/foo/bar
('x', 'x') ('x', 'x')
URI: https://example.org/bar URI: https://example.org/bar
('y', 'y') ('y', 'y')
URI: https://x@example.org/bar URI: https://x@example.org/bar
('x', 'x') ('x', 'x')
URI: https://y@example.org/bar URI: https://y@example.org/bar
('y', 'y') ('y', 'y')
*** Test user matching *** Test user matching
CFG: {x.password: xpassword, x.prefix: http://example.org/foo, x.username: None} CFG: {b'x.password': b'xpassword', b'x.prefix': b'http://example.org/foo', b'x.username': None}
URI: http://y@example.org/foo URI: http://y@example.org/foo
('y', 'xpassword') ('y', 'xpassword')
CFG: {x.password: xpassword, x.prefix: http://example.org/foo, x.username: None, y.password: ypassword, y.prefix: http://example.org/foo, y.username: y} CFG: {b'x.password': b'xpassword', b'x.prefix': b'http://example.org/foo', b'x.username': None, b'y.password': b'ypassword', b'y.prefix': b'http://example.org/foo', b'y.username': b'y'}
URI: http://y@example.org/foo URI: http://y@example.org/foo
('y', 'ypassword') ('y', 'ypassword')
CFG: {x.password: xpassword, x.prefix: http://example.org/foo/bar, x.username: None, y.password: ypassword, y.prefix: http://example.org/foo, y.username: y} CFG: {b'x.password': b'xpassword', b'x.prefix': b'http://example.org/foo/bar', b'x.username': None, b'y.password': b'ypassword', b'y.prefix': b'http://example.org/foo', b'y.username': b'y'}
URI: http://y@example.org/foo/bar URI: http://y@example.org/foo/bar
('y', 'xpassword') ('y', 'xpassword')
*** Test urllib2 and util.url *** Test urllib2 and util.url
URIs: http://user@example.com:8080/foo http://example.com:8080/foo URIs: http://user@example.com:8080/foo http://example.com:8080/foo
('user', '') ('user', '')