This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3495

tests: migrate test-wsgirequest.py to Python 3
ClosedPublic

Authored by durin42 on May 8 2018, 9:37 AM.

Details

Reviewers
pulkit
indygreg
Group Reviewers
hg-reviewers
Commits
rHGe0598133ac68: tests: migrate test-wsgirequest.py to Python 3
Summary
  1. skip-blame adding and removing b prefixes

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

durin42 created this revision.May 8 2018, 9:37 AM
indygreg accepted this revision.May 8 2018, 2:26 PM
This revision is now accepted and ready to land.May 8 2018, 2:26 PM
Closed by commit rHGe0598133ac68: tests: migrate test-wsgirequest.py to Python 3 (authored by durin42). · Explain WhyMay 8 2018, 2:29 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mcontrib/python3-whitelist (1 line)
Mtests/test-wsgirequest.py (32 lines)

Diff 8568

contrib/python3-whitelist

test-username-newline.t test-username-newline.t
test-verify.t test-verify.t
test-walkrepo.py test-walkrepo.py
test-websub.t test-websub.t
test-win32text.t test-win32text.t
test-wireproto-clientreactor.py test-wireproto-clientreactor.py
test-wireproto-framing.py test-wireproto-framing.py
test-wireproto-serverreactor.py test-wireproto-serverreactor.py
test-wsgirequest.py
test-xdg.t test-xdg.t

tests/test-wsgirequest.py

# the regex version. # the regex version.
assertRaisesRegex = (# camelcase-required assertRaisesRegex = (# camelcase-required
unittest.TestCase.assertRaisesRegexp) unittest.TestCase.assertRaisesRegexp)
def testreponame(self): def testreponame(self):
"""repository path components get stripped from URL.""" """repository path components get stripped from URL."""
with self.assertRaisesRegex(error.ProgrammingError, with self.assertRaisesRegex(error.ProgrammingError,
b'reponame requires PATH_INFO'): 'reponame requires PATH_INFO'):
parse(DEFAULT_ENV, reponame=b'repo') parse(DEFAULT_ENV, reponame=b'repo')
with self.assertRaisesRegex(error.ProgrammingError, with self.assertRaisesRegex(error.ProgrammingError,
b'PATH_INFO does not begin with repo ' 'PATH_INFO does not begin with repo '
b'name'): 'name'):
parse(DEFAULT_ENV, reponame=b'repo', extra={ parse(DEFAULT_ENV, reponame=b'repo', extra={
r'PATH_INFO': r'/pathinfo', r'PATH_INFO': r'/pathinfo',
}) })
with self.assertRaisesRegex(error.ProgrammingError, with self.assertRaisesRegex(error.ProgrammingError,
b'reponame prefix of PATH_INFO'): 'reponame prefix of PATH_INFO'):
parse(DEFAULT_ENV, reponame=b'repo', extra={ parse(DEFAULT_ENV, reponame=b'repo', extra={
r'PATH_INFO': r'/repoextra/path', r'PATH_INFO': r'/repoextra/path',
}) })
r = parse(DEFAULT_ENV, reponame=b'repo', extra={ r = parse(DEFAULT_ENV, reponame=b'repo', extra={
r'PATH_INFO': r'/repo/path1/path2', r'PATH_INFO': r'/repo/path1/path2',
}) })
self.assertEqual(r.advertisedbaseurl, b'http://testserver') self.assertEqual(r.advertisedbaseurl, b'http://testserver')
self.assertEqual(r.apppath, b'/prefix/repo') self.assertEqual(r.apppath, b'/prefix/repo')
self.assertEqual(r.dispatchparts, [b'path1', b'path2']) self.assertEqual(r.dispatchparts, [b'path1', b'path2'])
self.assertEqual(r.dispatchpath, b'path1/path2') self.assertEqual(r.dispatchpath, b'path1/path2')
self.assertEqual(r.reponame, b'prefix/repo') self.assertEqual(r.reponame, b'prefix/repo')
def testaltbaseurl(self): def testaltbaseurl(self):
# Simple hostname remap. # Simple hostname remap.
r = parse(DEFAULT_ENV, altbaseurl='http://altserver') r = parse(DEFAULT_ENV, altbaseurl=b'http://altserver')
self.assertEqual(r.url, b'http://testserver') self.assertEqual(r.url, b'http://testserver')
self.assertEqual(r.baseurl, b'http://testserver') self.assertEqual(r.baseurl, b'http://testserver')
self.assertEqual(r.advertisedurl, b'http://altserver') self.assertEqual(r.advertisedurl, b'http://altserver')
self.assertEqual(r.advertisedbaseurl, b'http://altserver') self.assertEqual(r.advertisedbaseurl, b'http://altserver')
self.assertEqual(r.urlscheme, b'http') self.assertEqual(r.urlscheme, b'http')
self.assertEqual(r.apppath, b'') self.assertEqual(r.apppath, b'')
self.assertEqual(r.dispatchparts, []) self.assertEqual(r.dispatchparts, [])
self.assertIsNone(r.dispatchpath) self.assertIsNone(r.dispatchpath)
self.assertIsNone(r.reponame) self.assertIsNone(r.reponame)
# With a custom port. # With a custom port.
r = parse(DEFAULT_ENV, altbaseurl='http://altserver:8000') r = parse(DEFAULT_ENV, altbaseurl=b'http://altserver:8000')
self.assertEqual(r.url, b'http://testserver') self.assertEqual(r.url, b'http://testserver')
self.assertEqual(r.baseurl, b'http://testserver') self.assertEqual(r.baseurl, b'http://testserver')
self.assertEqual(r.advertisedurl, b'http://altserver:8000') self.assertEqual(r.advertisedurl, b'http://altserver:8000')
self.assertEqual(r.advertisedbaseurl, b'http://altserver:8000') self.assertEqual(r.advertisedbaseurl, b'http://altserver:8000')
self.assertEqual(r.urlscheme, b'http') self.assertEqual(r.urlscheme, b'http')
self.assertEqual(r.apppath, b'') self.assertEqual(r.apppath, b'')
self.assertEqual(r.dispatchparts, []) self.assertEqual(r.dispatchparts, [])
self.assertIsNone(r.dispatchpath) self.assertIsNone(r.dispatchpath)
self.assertIsNone(r.reponame) self.assertIsNone(r.reponame)
# With a changed protocol. # With a changed protocol.
r = parse(DEFAULT_ENV, altbaseurl='https://altserver') r = parse(DEFAULT_ENV, altbaseurl=b'https://altserver')
self.assertEqual(r.url, b'http://testserver') self.assertEqual(r.url, b'http://testserver')
self.assertEqual(r.baseurl, b'http://testserver') self.assertEqual(r.baseurl, b'http://testserver')
self.assertEqual(r.advertisedurl, b'https://altserver') self.assertEqual(r.advertisedurl, b'https://altserver')
self.assertEqual(r.advertisedbaseurl, b'https://altserver') self.assertEqual(r.advertisedbaseurl, b'https://altserver')
# URL scheme is defined as the actual scheme, not advertised. # URL scheme is defined as the actual scheme, not advertised.
self.assertEqual(r.urlscheme, b'http') self.assertEqual(r.urlscheme, b'http')
self.assertEqual(r.apppath, b'') self.assertEqual(r.apppath, b'')
self.assertEqual(r.dispatchparts, []) self.assertEqual(r.dispatchparts, [])
self.assertIsNone(r.dispatchpath) self.assertIsNone(r.dispatchpath)
self.assertIsNone(r.reponame) self.assertIsNone(r.reponame)
# Need to specify explicit port number for proper https:// alt URLs. # Need to specify explicit port number for proper https:// alt URLs.
r = parse(DEFAULT_ENV, altbaseurl='https://altserver:443') r = parse(DEFAULT_ENV, altbaseurl=b'https://altserver:443')
self.assertEqual(r.url, b'http://testserver') self.assertEqual(r.url, b'http://testserver')
self.assertEqual(r.baseurl, b'http://testserver') self.assertEqual(r.baseurl, b'http://testserver')
self.assertEqual(r.advertisedurl, b'https://altserver') self.assertEqual(r.advertisedurl, b'https://altserver')
self.assertEqual(r.advertisedbaseurl, b'https://altserver') self.assertEqual(r.advertisedbaseurl, b'https://altserver')
self.assertEqual(r.urlscheme, b'http') self.assertEqual(r.urlscheme, b'http')
self.assertEqual(r.apppath, b'') self.assertEqual(r.apppath, b'')
self.assertEqual(r.dispatchparts, []) self.assertEqual(r.dispatchparts, [])
self.assertIsNone(r.dispatchpath) self.assertIsNone(r.dispatchpath)
self.assertIsNone(r.reponame) self.assertIsNone(r.reponame)
# With only PATH_INFO defined. # With only PATH_INFO defined.
r = parse(DEFAULT_ENV, altbaseurl='http://altserver', extra={ r = parse(DEFAULT_ENV, altbaseurl=b'http://altserver', extra={
r'PATH_INFO': r'/path1/path2', r'PATH_INFO': r'/path1/path2',
}) })
self.assertEqual(r.url, b'http://testserver/path1/path2') self.assertEqual(r.url, b'http://testserver/path1/path2')
self.assertEqual(r.baseurl, b'http://testserver') self.assertEqual(r.baseurl, b'http://testserver')
self.assertEqual(r.advertisedurl, b'http://altserver/path1/path2') self.assertEqual(r.advertisedurl, b'http://altserver/path1/path2')
self.assertEqual(r.advertisedbaseurl, b'http://altserver') self.assertEqual(r.advertisedbaseurl, b'http://altserver')
self.assertEqual(r.urlscheme, b'http') self.assertEqual(r.urlscheme, b'http')
self.assertEqual(r.apppath, b'') self.assertEqual(r.apppath, b'')
self.assertEqual(r.dispatchparts, [b'path1', b'path2']) self.assertEqual(r.dispatchparts, [b'path1', b'path2'])
self.assertEqual(r.dispatchpath, b'path1/path2') self.assertEqual(r.dispatchpath, b'path1/path2')
self.assertIsNone(r.reponame) self.assertIsNone(r.reponame)
# Path on alt URL. # Path on alt URL.
r = parse(DEFAULT_ENV, altbaseurl='http://altserver/altpath') r = parse(DEFAULT_ENV, altbaseurl=b'http://altserver/altpath')
self.assertEqual(r.url, b'http://testserver') self.assertEqual(r.url, b'http://testserver')
self.assertEqual(r.baseurl, b'http://testserver') self.assertEqual(r.baseurl, b'http://testserver')
self.assertEqual(r.advertisedurl, b'http://altserver/altpath') self.assertEqual(r.advertisedurl, b'http://altserver/altpath')
self.assertEqual(r.advertisedbaseurl, b'http://altserver') self.assertEqual(r.advertisedbaseurl, b'http://altserver')
self.assertEqual(r.urlscheme, b'http') self.assertEqual(r.urlscheme, b'http')
self.assertEqual(r.apppath, b'/altpath') self.assertEqual(r.apppath, b'/altpath')
self.assertEqual(r.dispatchparts, []) self.assertEqual(r.dispatchparts, [])
self.assertIsNone(r.dispatchpath) self.assertIsNone(r.dispatchpath)
self.assertIsNone(r.reponame) self.assertIsNone(r.reponame)
# With a trailing slash. # With a trailing slash.
r = parse(DEFAULT_ENV, altbaseurl='http://altserver/altpath/') r = parse(DEFAULT_ENV, altbaseurl=b'http://altserver/altpath/')
self.assertEqual(r.url, b'http://testserver') self.assertEqual(r.url, b'http://testserver')
self.assertEqual(r.baseurl, b'http://testserver') self.assertEqual(r.baseurl, b'http://testserver')
self.assertEqual(r.advertisedurl, b'http://altserver/altpath/') self.assertEqual(r.advertisedurl, b'http://altserver/altpath/')
self.assertEqual(r.advertisedbaseurl, b'http://altserver') self.assertEqual(r.advertisedbaseurl, b'http://altserver')
self.assertEqual(r.urlscheme, b'http') self.assertEqual(r.urlscheme, b'http')
self.assertEqual(r.apppath, b'/altpath/') self.assertEqual(r.apppath, b'/altpath/')
self.assertEqual(r.dispatchparts, []) self.assertEqual(r.dispatchparts, [])
self.assertIsNone(r.dispatchpath) self.assertIsNone(r.dispatchpath)
self.assertIsNone(r.reponame) self.assertIsNone(r.reponame)
# PATH_INFO + path on alt URL. # PATH_INFO + path on alt URL.
r = parse(DEFAULT_ENV, altbaseurl='http://altserver/altpath', extra={ r = parse(DEFAULT_ENV, altbaseurl=b'http://altserver/altpath', extra={
r'PATH_INFO': r'/path1/path2', r'PATH_INFO': r'/path1/path2',
}) })
self.assertEqual(r.url, b'http://testserver/path1/path2') self.assertEqual(r.url, b'http://testserver/path1/path2')
self.assertEqual(r.baseurl, b'http://testserver') self.assertEqual(r.baseurl, b'http://testserver')
self.assertEqual(r.advertisedurl, self.assertEqual(r.advertisedurl,
b'http://altserver/altpath/path1/path2') b'http://altserver/altpath/path1/path2')
self.assertEqual(r.advertisedbaseurl, b'http://altserver') self.assertEqual(r.advertisedbaseurl, b'http://altserver')
self.assertEqual(r.urlscheme, b'http') self.assertEqual(r.urlscheme, b'http')
self.assertEqual(r.apppath, b'/altpath') self.assertEqual(r.apppath, b'/altpath')
self.assertEqual(r.dispatchparts, [b'path1', b'path2']) self.assertEqual(r.dispatchparts, [b'path1', b'path2'])
self.assertEqual(r.dispatchpath, b'path1/path2') self.assertEqual(r.dispatchpath, b'path1/path2')
self.assertIsNone(r.reponame) self.assertIsNone(r.reponame)
# PATH_INFO + path on alt URL with trailing slash. # PATH_INFO + path on alt URL with trailing slash.
r = parse(DEFAULT_ENV, altbaseurl='http://altserver/altpath/', extra={ r = parse(DEFAULT_ENV, altbaseurl=b'http://altserver/altpath/', extra={
r'PATH_INFO': r'/path1/path2', r'PATH_INFO': r'/path1/path2',
}) })
self.assertEqual(r.url, b'http://testserver/path1/path2') self.assertEqual(r.url, b'http://testserver/path1/path2')
self.assertEqual(r.baseurl, b'http://testserver') self.assertEqual(r.baseurl, b'http://testserver')
self.assertEqual(r.advertisedurl, self.assertEqual(r.advertisedurl,
b'http://altserver/altpath//path1/path2') b'http://altserver/altpath//path1/path2')
self.assertEqual(r.advertisedbaseurl, b'http://altserver') self.assertEqual(r.advertisedbaseurl, b'http://altserver')
self.assertEqual(r.urlscheme, b'http') self.assertEqual(r.urlscheme, b'http')
self.assertEqual(r.apppath, b'/altpath/') self.assertEqual(r.apppath, b'/altpath/')
self.assertEqual(r.dispatchparts, [b'path1', b'path2']) self.assertEqual(r.dispatchparts, [b'path1', b'path2'])
self.assertEqual(r.dispatchpath, b'path1/path2') self.assertEqual(r.dispatchpath, b'path1/path2')
self.assertIsNone(r.reponame) self.assertIsNone(r.reponame)
# Local SCRIPT_NAME is ignored. # Local SCRIPT_NAME is ignored.
r = parse(DEFAULT_ENV, altbaseurl='http://altserver', extra={ r = parse(DEFAULT_ENV, altbaseurl=b'http://altserver', extra={
r'SCRIPT_NAME': r'/script', r'SCRIPT_NAME': r'/script',
r'PATH_INFO': r'/path1/path2', r'PATH_INFO': r'/path1/path2',
}) })
self.assertEqual(r.url, b'http://testserver/script/path1/path2') self.assertEqual(r.url, b'http://testserver/script/path1/path2')
self.assertEqual(r.baseurl, b'http://testserver') self.assertEqual(r.baseurl, b'http://testserver')
self.assertEqual(r.advertisedurl, b'http://altserver/path1/path2') self.assertEqual(r.advertisedurl, b'http://altserver/path1/path2')
self.assertEqual(r.advertisedbaseurl, b'http://altserver') self.assertEqual(r.advertisedbaseurl, b'http://altserver')
self.assertEqual(r.urlscheme, b'http') self.assertEqual(r.urlscheme, b'http')
self.assertEqual(r.apppath, b'') self.assertEqual(r.apppath, b'')
self.assertEqual(r.dispatchparts, [b'path1', b'path2']) self.assertEqual(r.dispatchparts, [b'path1', b'path2'])
self.assertEqual(r.dispatchpath, b'path1/path2') self.assertEqual(r.dispatchpath, b'path1/path2')
self.assertIsNone(r.reponame) self.assertIsNone(r.reponame)
# Use remote's path for script name, app path # Use remote's path for script name, app path
r = parse(DEFAULT_ENV, altbaseurl='http://altserver/altroot', extra={ r = parse(DEFAULT_ENV, altbaseurl=b'http://altserver/altroot', extra={
r'SCRIPT_NAME': r'/script', r'SCRIPT_NAME': r'/script',
r'PATH_INFO': r'/path1/path2', r'PATH_INFO': r'/path1/path2',
}) })
self.assertEqual(r.url, b'http://testserver/script/path1/path2') self.assertEqual(r.url, b'http://testserver/script/path1/path2')
self.assertEqual(r.baseurl, b'http://testserver') self.assertEqual(r.baseurl, b'http://testserver')
self.assertEqual(r.advertisedurl, self.assertEqual(r.advertisedurl,
b'http://altserver/altroot/path1/path2') b'http://altserver/altroot/path1/path2')
self.assertEqual(r.advertisedbaseurl, b'http://altserver') self.assertEqual(r.advertisedbaseurl, b'http://altserver')
self.assertEqual(r.urlscheme, b'http') self.assertEqual(r.urlscheme, b'http')
self.assertEqual(r.apppath, b'/altroot') self.assertEqual(r.apppath, b'/altroot')
self.assertEqual(r.dispatchparts, [b'path1', b'path2']) self.assertEqual(r.dispatchparts, [b'path1', b'path2'])
self.assertEqual(r.dispatchpath, b'path1/path2') self.assertEqual(r.dispatchpath, b'path1/path2')
self.assertIsNone(r.reponame) self.assertIsNone(r.reponame)
# reponame is factored in properly. # reponame is factored in properly.
r = parse(DEFAULT_ENV, reponame=b'repo', r = parse(DEFAULT_ENV, reponame=b'repo',
altbaseurl='http://altserver/altroot', altbaseurl=b'http://altserver/altroot',
extra={ extra={
r'SCRIPT_NAME': r'/script', r'SCRIPT_NAME': r'/script',
r'PATH_INFO': r'/repo/path1/path2', r'PATH_INFO': r'/repo/path1/path2',
}) })
self.assertEqual(r.url, b'http://testserver/script/repo/path1/path2') self.assertEqual(r.url, b'http://testserver/script/repo/path1/path2')
self.assertEqual(r.baseurl, b'http://testserver') self.assertEqual(r.baseurl, b'http://testserver')
self.assertEqual(r.advertisedurl, self.assertEqual(r.advertisedurl,