Breezy

Merge lp:~gz/brz/prune_passing_py3 into lp:brz

prune_passing_py3
Merge into trunk

Proposed by Martin Packman on 2018-08-07

Status:	Merged
Approved by:	Jelmer Vernooij on 2018-08-07
Approved revision:	no longer in the source branch.
Merge reported by:	The Breezy Bot
Merged at revision:	not available
Proposed branch:	lp:~gz/brz/prune_passing_py3
Merge into:	lp:brz
Diff against target:	1256 lines (+37/-260) 3 files modified Makefile (+2/-2) breezy/tests/__init__.py (+1/-1) python3.passing (+34/-257)
To merge this branch:	bzr merge lp:~gz/brz/prune_passing_py3
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Jelmer Vernooij		2018-08-07	Approve on 2018-08-07
Review via email: mp+352525@code.launchpad.net

Commit message

Ensure only strictly passing tests are in python3.passing

Description of the change

The strict flag doesn't completely work as interpreting the subunit stream matters, but seems the right thing to do? Helps the N/A case at least it seems?

Update Makefile targets and avoid missing method on subunit.

Delete renamed and removed tests from python3.passing, also adds a few that pass with extensions built.

Revision history for this message

Jelmer Vernooij (jelmer) on 2018-08-07:

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

Subscribers

People subscribed via source and target branches

to all changes:

Breezy developers

Martin Packman

Robert Ladyman

1	=== modified file 'Makefile'
2	--- Makefile 2018-07-17 18:06:19 +0000
3	+++ Makefile 2018-08-07 00:56:28 +0000
4	@@ -52,7 +52,7 @@
5	-$(RM) -f selftest.log
6	echo `date` ": selftest starts" 1>&2
7	set -o pipefail; BRZ_PLUGIN_PATH=$(BRZ_PLUGIN_PATH) $(PYTHON3) -Werror -Wignore::ImportWarning -Wignore::PendingDeprecationWarning -Wignore::DeprecationWarning -O \
8	- ./brz selftest -Oselftest.timeout=120 --load-list=python3.passing \
9	+ ./brz selftest -Oselftest.timeout=120 --load-list=python3.passing --strict \
10	--subunit2 $(tests) \| tee selftest.log \| subunit-2to1
11	echo `date` ": selftest ends" 1>&2
12	# An empty log file should catch errors in the $(PYTHON3)
13	@@ -66,7 +66,7 @@
14	# Generate a stream for PQM to watch.
15	-$(RM) -f selftest.log
16	-BRZ_PLUGIN_PATH=$(BRZ_PLUGIN_PATH) $(PYTHON3) -Werror -Wignore::ImportWarning -Wignore::DeprecationWarning -O \
17	- ./brz selftest -Oselftest.timeout=120 \
18	+ ./brz selftest -Oselftest.timeout=120 --strict \
19	--subunit2 $(tests) > selftest.log
20	grep -v "^#" python3.passing > python3.passing.new
21	cat selftest.log \| \
22
23	=== modified file 'breezy/tests/__init__.py'
24	--- breezy/tests/__init__.py 2018-08-01 21:11:06 +0000
25	+++ breezy/tests/__init__.py 2018-08-07 00:56:28 +0000
26	@@ -3286,7 +3286,7 @@
27	stream.write("%s\n" % (t.id()))
28	return True
29	result = runner.run(suite)
30	- if strict:
31	+ if strict and getattr(result, 'wasStrictlySuccessful', False):
32	return result.wasStrictlySuccessful()
33	else:
34	return result.wasSuccessful()
35
36	=== modified file 'python3.passing'
37	--- python3.passing 2018-08-01 22:01:36 +0000
38	+++ python3.passing 2018-08-07 00:56:28 +0000
39	@@ -1,13 +1,5 @@
40	# This is the list of tests that are known to pass with Python3.