This is an archive of the discontinued Mercurial Phabricator instance.

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	9419		Jul 3 2018, 7:42 PM	★	★
Diff 2	9424		Jul 3 2018, 7:50 PM	★	★
Diff 3	9448	rHG296648321710985404e8b082bccd426e72c9cce1	Jul 2 2018, 3:02 AM	★	★

Commit	Parents	Author	Summary	Date
		Martin von Zweigbergk		Jul 2 2018, 3:02 AM

Status	Author	Revision
Closed	martinvonz	D3881 tests: don't allow reodering of glob/re lines across non-glob/re lines
Closed	martinvonz	D3880 tests: add test showing puzzling test output with (glob) lines
Closed	martinvonz	D3879 tests: move handling of None "el" out of linematch()
Closed	martinvonz	D3878 tests: remove some redundant code in run-tests
Closed	martinvonz	D3877 tests: don't reimplement enumerate() in run-tests

Diff 9424

	if not lout.endswith(b'\n'):			if not lout.endswith(b'\n'):
	lout += b' (no-eol)\n'			lout += b' (no-eol)\n'

	# Find the expected output at the current position.			# Find the expected output at the current position.
	els = [None]			els = [None]
	if expected.get(pos, None):			if expected.get(pos, None):
	els = expected[pos]			els = expected[pos]

	i = 0
	optional = []			optional = []
	while i < len(els):			for i, el in enumerate(els):
	el = els[i]

	r = self.linematch(el, lout)			r = self.linematch(el, lout)
	if isinstance(r, str):			if isinstance(r, str):
	if r == '-glob':			if r == '-glob':
	lout = ''.join(el.rsplit(' (glob)', 1))			lout = ''.join(el.rsplit(' (glob)', 1))
	r = '' # Warn only this line.			r = '' # Warn only this line.
	elif r == "retry":			elif r == "retry":
	postout.append(b' ' + el)			postout.append(b' ' + el)
	m = optline.match(el)			m = optline.match(el)
	if m:			if m:
	conditions = [			conditions = [
	c for c in m.group(2).split(b' ')]			c for c in m.group(2).split(b' ')]

	if not self._iftest(conditions):			if not self._iftest(conditions):
	optional.append(i)			optional.append(i)

	i += 1

	if r:			if r:
	if r == "retry":			if r == "retry":
	continue			continue
	# clean up any optional leftovers			# clean up any optional leftovers
	for i in optional:			for i in optional:
	postout.append(b' ' + els[i])			postout.append(b' ' + els[i])
	for i in reversed(optional):			for i in reversed(optional):
	del els[i]			del els[i]