This is an archive of the discontinued Mercurial Phabricator instance.

Status	Author	Revision
Closed	durin42	D3515 tests: port test-ui-verbosity.py to Python 3
Closed	durin42	D3514 tests: port test-lfs-pointer.py to Python 3
Closed	durin42	D3513 lfs: stabilize error message values for Python 2 and 3
Closed	durin42	D3512 tests: port test-ui-color.py to Python 3
Closed	durin42	D3511 tests: port test-dispatch.py to Python 3
Closed	durin42	D3510 tests: port test-wireproto.py to Python 3
Closed	durin42	D3509 tests: port test-context.py to Python 3
Closed	durin42	D3508 scmutil: fix __repr__ of status tuple
Closed	durin42	D3507 tests: fix test-status-inprocess.py on Python 3
Closed	durin42	D3506 tests: port test-filecache.py to Python 3
Closed	durin42	D3505 tests: port test-cbor.py to Python 3
Closed	durin42	D3504 cborutil: port to Python 3
Closed	durin42	D3503 lock: pass sysstr to warnings module
Closed	durin42	D3496 tests: port test-revlog-raw.py to Python 3
Closed	durin42	D3495 tests: migrate test-wsgirequest.py to Python 3
Closed	durin42	D3494 tests: port test-parseindex2.py to Python 3
Closed	durin42	D3493 tests: prefer string concatenation with () instead of \ in parseindex2 tests
Closed	durin42	D3492 tests: port test-simplemerge.py to Python 3
Closed	durin42	D3491 tests: replace use of assertEquals with assertEqual in test-simplemerge.py
Closed	durin42	D3490 py3: whitelist three passing cvs convert tests
Closed	durin42	D3489 cvsps: convert encoding name to sysstr
Closed	durin42	D3488 tests: b prefixes on some inline python in test-convert-cvs.t
Closed	durin42	D3487 cvsps: wrap bytes in bytestr before %r-ing it
Closed	durin42	D3486 convcmd: make a copy of heads before mutating it
Closed	durin42	D3485 cvsps: portably convert int to bytes
Closed	durin42	D3484 cvsps: wrap cmp methods (deprecated) in functools.cmp_to_key
Closed	durin42	D3483 tests: port inline extension in test-convert-cvs.t to py3
Closed	durin42	D3482 cvsps: add b prefixes to regular expressions

Diff 8547

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,

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	8547		May 8 2018, 9:37 AM	★	★
Diff 2	8568	rHGe0598133ac6835818bd0b159864611d9a89dc8ba	Apr 27 2018, 10:40 AM	★	★

This is an archive of the discontinued Mercurial Phabricator instance.

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

Details

Diff Detail

Event Timeline

Revision ContentsChangeset List

Diff 8547

contrib/python3-whitelist

tests/test-wsgirequest.py

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

Revision Contents
Changeset List