Merge ~paride/simplestreams:fix-pytest-path into simplestreams:master

Proposed by Paride Legovini
Status: Merged
Approved by: Paride Legovini
Approved revision: 5cef25cf05baf3aeb6ac2cf2b414bd6aed9cb2c1
Merge reported by: Server Team CI bot
Merged at revision: not available
Proposed branch: ~paride/simplestreams:fix-pytest-path
Merge into: simplestreams:master
Diff against target: 32 lines (+2/-11)
2 files modified
Makefile (+2/-6)
debian/rules (+0/-5)
Reviewer Review Type Date Requested Status
Server Team CI bot continuous-integration Approve
Alberto Contreras (community) Approve
Review via email:

Commit message

test: adjust the pytest entry point for pre-Kinetic compatibility

To post a comment you must log in.
Revision history for this message
Alberto Contreras (aciba) wrote :


review: Approve
Revision history for this message
Server Team CI bot (server-team-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
Paride Legovini (paride) wrote :

Fixed a typo in the commit message, CI should run again.

Revision history for this message
Server Team CI bot (server-team-bot) wrote :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/Makefile b/Makefile
2index a763c45..2bdcf22 100644
3--- a/Makefile
4+++ b/Makefile
5@@ -8,12 +8,8 @@ endif
6 build:
7 @echo nothing to do for $@
9-test: test2 test3
11-test3: examples-sign
12- $(TENV) pytest -v tests/
13-test2: examples-sign
14- $(TENV) pytest -v tests/
15+test: examples-sign
16+ $(TENV) python3 -m pytest -v tests/
18 flake8:
19 # any means run via 'flake8' or 'python3 -m flake8'
20diff --git a/debian/rules b/debian/rules
21index 018faf6..060b413 100755
22--- a/debian/rules
23+++ b/debian/rules
24@@ -14,8 +14,3 @@ override_dh_auto_install:
26 override_dh_missing:
27 dh_missing --list-missing
30-ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
31- make test3


People subscribed via source and target branches