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

[Paride Legovini]

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

[Alberto Contreras (aciba)]

Thanks!

review: Approve

[Server Team CI bot (server-team-bot)]

PASSED: Continuous integration, rev:20e1c441bc3a581c5abea024e63801c03aee316a
https://jenkins.canonical.com/server-team/job/simplestreams-ci/6/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/server-team/job/simplestreams-ci/nodes=metal-amd64/6/
    SUCCESS: https://jenkins.canonical.com/server-team/job/simplestreams-ci/nodes=metal-ppc64el/6/
    SUCCESS: https://jenkins.canonical.com/server-team/job/simplestreams-ci/nodes=metal-s390x/6/

Click here to trigger a rebuild:
https://jenkins.canonical.com/server-team/job/simplestreams-ci/6//rebuild

review: Approve (continuous-integration)

[Paride Legovini (paride)]

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

[Server Team CI bot (server-team-bot)]

PASSED: Continuous integration, rev:5cef25cf05baf3aeb6ac2cf2b414bd6aed9cb2c1
https://jenkins.canonical.com/server-team/job/simplestreams-ci/7/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/server-team/job/simplestreams-ci/nodes=metal-amd64/7/
    SUCCESS: https://jenkins.canonical.com/server-team/job/simplestreams-ci/nodes=metal-ppc64el/7/
    SUCCESS: https://jenkins.canonical.com/server-team/job/simplestreams-ci/nodes=metal-s390x/7/

Click here to trigger a rebuild:
https://jenkins.canonical.com/server-team/job/simplestreams-ci/7//rebuild

review: Approve (continuous-integration)

diff --git a/Makefile b/Makefile
index a763c45..2bdcf22 100644
--- a/Makefile
+++ b/Makefile
@@ -8,12 +8,8 @@ endif
 build:
 	@echo nothing to do for $@
 
-test: test2 test3
-
-test3: examples-sign
-	$(TENV) pytest -v tests/
-test2: examples-sign
-	$(TENV) pytest -v tests/
+test: examples-sign
+	$(TENV) python3 -m pytest -v tests/
 
 flake8:
 	# any means run via 'flake8' or 'python3 -m flake8'
diff --git a/debian/rules b/debian/rules
index 018faf6..060b413 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,8 +14,3 @@ override_dh_auto_install:
 
 override_dh_missing:
 	dh_missing --list-missing
-
-override_dh_auto_test:
-ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
-	make test3
-endif