Merge ~aciba/simplestreams:migrate_to_pytest into simplestreams:master

[Alberto Contreras]

migrate nose to pytest

nose is not supported on python 3.10+

Fixes https://bugs.launchpad.net/simplestreams/+bug/1990495

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

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

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

review: Approve (continuous-integration)

[Thomas Bechtold (toabctl)]

thx!

review: Approve

[Paride Legovini (paride)]

Approving for CI to merge. Thanks!

review: Approve

[Alberto Contreras (aciba)]

It was a pleasure!

[Adam Collard (adam-collard)]

./tools/tenv: 21: exec: pytest: not found

autopkgtest is failing

[Adam Collard (adam-collard)]

I expect this is because python3-pytest package installs /usr/bin/py.test-3 and not anything on $PATH called pytest

Of course `python3 -m pytest` is the other option

[Paride Legovini (paride)]

Yep saw that, the build recipe failed, thanks. It's not even an autopkgtest failure, it's the build-time dh_auto_test target that fails. I'm preparing a MP to fix it.

[Paride Legovini (paride)]

Interestingly Kinetic's python3-pytest does install /usr/bin/pytest, which is why I didn't hit the FTBFS locally. More precisely /usr/bin/pytest is installed since python3-pytest 6.2.5-3:

pytest (6.2.5-3) unstable; urgency=medium

  * Team upload.
  * Keep upstream's entry points

diff --git a/Makefile b/Makefile
index 3387cc1..a763c45 100644
--- a/Makefile
+++ b/Makefile
@@ -11,9 +11,9 @@ build:
 test: test2 test3
 
 test3: examples-sign
-	$(TENV) nosetests3 -v tests/
+	$(TENV) pytest -v tests/
 test2: examples-sign
-	$(TENV) nosetests -v tests/
+	$(TENV) pytest -v tests/
 
 flake8:
 	# any means run via 'flake8' or 'python3 -m flake8'
diff --git a/debian/control b/debian/control
index 697def8..51372b8 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,8 @@ Build-Depends: debhelper-compat (= 13),
                python3-glanceclient,
                python3-keystoneclient,
                python3-mock,
-               python3-nose,
+               python3-pytest,
+               python3-pytest-cov,
                python3-requests (>= 1.1),
                python3-setuptools,
                python3-swiftclient,
diff --git a/tests/unittests/test_contentsource.py b/tests/unittests/test_contentsource.py
index 862a147..ef838a2 100644
--- a/tests/unittests/test_contentsource.py
+++ b/tests/unittests/test_contentsource.py
@@ -8,7 +8,7 @@ from simplestreams import objectstores
 from simplestreams import contentsource
 from subprocess import Popen, PIPE, STDOUT
 from unittest import TestCase, skipIf
-from nose.tools import raises
+import pytest
 
 
 class RandomPortServer(object):
@@ -253,11 +253,11 @@ class TestResume(BaseDirUsingTestCase):
             # header, so we get two 'hello's.
             assert contents == b'hellohello world\n', contents
 
-    @raises(Exception)
     def test_post_open_set_start_pos(self):
-        cs = contentsource.UrlContentSource(self.furl_for('foo'))
-        cs.open()
-        cs.set_start_pos(1)
+        with pytest.raises(Exception):
+            cs = contentsource.UrlContentSource(self.furl_for('foo'))
+            cs.open()
+            cs.set_start_pos(1)
 
     def test_percent_callback(self):
         data = {'dld': 0}
diff --git a/tests/unittests/test_glancemirror.py b/tests/unittests/test_glancemirror.py
index cf4195b..53b624c 100644
--- a/tests/unittests/test_glancemirror.py
+++ b/tests/unittests/test_glancemirror.py
@@ -161,7 +161,6 @@ class FakeImages(object):
         self.image_import_calls.append(image_id)
 
     def list(self, **kwargs):
-        # from nose.tools import set_trace; set_trace()
         return list(self.imgdb.values())
 
 
diff --git a/tests/unittests/test_signed_data.py b/tests/unittests/test_signed_data.py
index 02f2dff..2b31e76 100644
--- a/tests/unittests/test_signed_data.py
+++ b/tests/unittests/test_signed_data.py
@@ -2,7 +2,7 @@ import shutil
 import subprocess
 import tempfile
 
-from nose.tools import raises
+import pytest
 from os.path import join
 from simplestreams import mirrors
 from simplestreams import objectstores
@@ -15,27 +15,27 @@ def _tmp_reader():
     return mirrors.ObjectStoreMirrorReader(sstore)
 
 
-@raises(subprocess.CalledProcessError)
 def test_read_bad_data():
-    good = join(EXAMPLES_DIR, "foocloud", "streams", "v1", "index.sjson")
-    bad = join(tempfile.gettempdir(), "index.sjson")
-    shutil.copy(good, bad)
-    with open(bad, 'r+') as f:
-        lines = f.readlines()
-        f.truncate()
-        f.seek(0)
-        for line in lines:
-            f.write(line.replace('foovendor', 'attacker'))
+    with pytest.raises(subprocess.CalledProcessError):
+        good = join(EXAMPLES_DIR, "foocloud", "streams", "v1", "index.sjson")
+        bad = join(tempfile.gettempdir(), "index.sjson")
+        shutil.copy(good, bad)
+        with open(bad, 'r+') as f:
+            lines = f.readlines()
+            f.truncate()
+            f.seek(0)
+            for line in lines:
+                f.write(line.replace('foovendor', 'attacker'))
 
-    _tmp_reader().read_json("index.sjson")
+        _tmp_reader().read_json("index.sjson")
 
 
-@raises(SignatureMissingException)
 def test_read_unsigned():
-    # empty files aren't signed
-    open(join(tempfile.gettempdir(), 'index.json'), 'w').close()
+    with pytest.raises(SignatureMissingException):
+        # empty files aren't signed
+        open(join(tempfile.gettempdir(), 'index.json'), 'w').close()
 
-    _tmp_reader().read_json("index.json")
+        _tmp_reader().read_json("index.json")
 
 
 def test_read_signed():
diff --git a/tox.ini b/tox.ini
index b450afc..4d09a1b 100644
--- a/tox.ini
+++ b/tox.ini
@@ -8,15 +8,13 @@ setenv =
 commands = 
     {toxinidir}/tools/create-gpgdir
     {toxinidir}/tools/sign-examples
-    {envpython} -m nose {posargs:--with-coverage --cover-erase \
-        --cover-branches --cover-package=simplestreams --cover-inclusive \
-        tests} 
+    {envpython} -m pytest {posargs:--cov=simplestreams --cov-branch tests}
 deps =
-    coverage
     mock
-    nose
     python-glanceclient
-    python-keystoneclient 
+    python-keystoneclient
+    pytest
+    pytest-cov
 
 [testenv:flake8]
 basepython = python3
@@ -27,9 +25,9 @@ commands = {toxinidir}/tools/run-flake8 {posargs}
 
 [testenv:py3-noopenstack]
 deps =
-    coverage
     mock
-    nose
+    pytest
+    pytest-cov
 basepython = python3
 
 [testenv:snap]