1
diff --git a/Makefile b/Makefile
2
index a763c45..2bdcf22 100644
3
--- a/Makefile
4
+++ b/Makefile
5
@@ -8,12 +8,8 @@ endif
6
8
build:
8
build:
7
9
	@echo nothing to do for $@
9
	@echo nothing to do for $@
8
10
10
15
11
test: test2 test3
11
test: examples-sign
16
12
12
	$(TENV) python3 -m pytest -v tests/
11
13
test3: examples-sign
12
14
	$(TENV) pytest -v tests/
13
15
test2: examples-sign
14
16
	$(TENV) pytest -v tests/
17
17
13
18
18
flake8:
14
flake8:
19
19
	# any means run via 'flake8' or 'python3 -m flake8'
15
	# any means run via 'flake8' or 'python3 -m flake8'
20
diff --git a/debian/rules b/debian/rules
21
index 018faf6..060b413 100755
22
--- a/debian/rules
23
+++ b/debian/rules
24
@@ -14,8 +14,3 @@ override_dh_auto_install:
25
14
14
26
15
override_dh_missing:
15
override_dh_missing:
27
16
	dh_missing --list-missing
16
	dh_missing --list-missing
28
17
29
18
override_dh_auto_test:
30
19
ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
31
20
	make test3
32
21
endif
Status:	Merged
Approved by:	Paride Legovini on 2022-09-28
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)
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Server Team CI bot	continuous-integration		Approve on 2022-09-28
Alberto Contreras (community)		2022-09-28	Approve on 2022-09-28
Review via email: mp+430658@code.launchpad.net
1	diff --git a/Makefile b/Makefile
2	index a763c45..2bdcf22 100644
3	--- a/Makefile
4	+++ b/Makefile
5	@@ -8,12 +8,8 @@ endif
6	8	build:	8	build:
7	9	@echo nothing to do for $@	9	@echo nothing to do for $@
8	10		10
15	11	test: test2 test3	11	test: examples-sign
16	12		12	$(TENV) python3 -m pytest -v tests/
11	13	test3: examples-sign
12	14	$(TENV) pytest -v tests/
13	15	test2: examples-sign
14	16	$(TENV) pytest -v tests/
17	17		13
18	18	flake8:	14	flake8:
19	19	# any means run via 'flake8' or 'python3 -m flake8'	15	# any means run via 'flake8' or 'python3 -m flake8'
20	diff --git a/debian/rules b/debian/rules
21	index 018faf6..060b413 100755
22	--- a/debian/rules
23	+++ b/debian/rules
24	@@ -14,8 +14,3 @@ override_dh_auto_install:
25	14		14
26	15	override_dh_missing:	15	override_dh_missing:
27	16	dh_missing --list-missing	16	dh_missing --list-missing
28	17
29	18	override_dh_auto_test:
30	19	ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
31	20	make test3
32	21	endif