Merge ~daniel-thewatkins/curtin/+git/curtin:py3_deb_only into curtin:master

Proposed by Dan Watkins on 2019-08-21
Status: Merged
Approved by: Ryan Harper on 2019-08-21
Approved revision: ce4d3eca14265e01591b569825dc12112fea8432
Merge reported by: Server Team CI bot
Merged at revision: not available
Proposed branch: ~daniel-thewatkins/curtin/+git/curtin:py3_deb_only
Merge into: curtin:master
Diff against target: 19 lines (+5/-1)
1 file modified
Makefile (+5/-1)
Reviewer Review Type Date Requested Status
Server Team CI bot continuous-integration Approve on 2019-08-21
Ryan Harper 2019-08-21 Approve on 2019-08-21
Review via email: mp+371589@code.launchpad.net

Commit message

Makefile: split Python 2 and Python 3 unittest targets apart

This doesn't change the behaviour of any existing targets, but splits
the unittest target into unittest2 and unittest3 (so the packaging can
run only the Python 3 tests).

To post a comment you must log in.
Ryan Harper (raharper) wrote :

Seems reasonable. I was wondering if we should only run py2 unittests if we have a py2 present? Or do you plan to do that sort of change in a separate branch?

Dan Watkins (daniel-thewatkins) wrote :

> I was wondering if we should only run py2 unittests if we have a py2 present?

I'd worry about silently not running tests that people thought they _were_ running in this case. I think it's better for the invocation to fail explicitly, so people can choose to either make a Python 2 available, or to explicitly only run the Python 3 tests.

> Or do you plan to do that sort of change in a separate branch?

This is the only change I'm planning, as it's all that's required to drop the Python 2 packages in Ubuntu (by giving us a Makefile target we can run without needing the Python 2 build-deps installed).

Ryan Harper (raharper) wrote :

Sounds good. Thanks!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/Makefile b/Makefile
2index 25db1d0..827102c 100644
3--- a/Makefile
4+++ b/Makefile
5@@ -31,10 +31,14 @@ pyflakes:
6 pyflakes3:
7 @$(CWD)/tools/run-pyflakes3
8
9-unittest:
10+unittest2:
11 nosetests $(coverageopts) $(noseopts) tests/unittests
12+
13+unittest3:
14 nosetests3 $(coverageopts) $(noseopts) tests/unittests
15
16+unittest: unittest2 unittest3
17+
18 schema-validate:
19 @$(CWD)/tools/schema-validate-storage
20

Subscribers

People subscribed via source and target branches