1
diff --git a/Makefile b/Makefile
2
index 3387cc1..a763c45 100644
3
--- a/Makefile
4
+++ b/Makefile
5
@@ -11,9 +11,9 @@ build:
6
11
test: test2 test3
11
test: test2 test3
7
12
12
8
13
test3: examples-sign
13
test3: examples-sign
10
14
	$(TENV) nosetests3 -v tests/
14
	$(TENV) pytest -v tests/
11
15
test2: examples-sign
15
test2: examples-sign
13
16
	$(TENV) nosetests -v tests/
16
	$(TENV) pytest -v tests/
14
17
17
15
18
flake8:
18
flake8:
16
19
	# any means run via 'flake8' or 'python3 -m flake8'
19
	# any means run via 'flake8' or 'python3 -m flake8'
17
diff --git a/debian/control b/debian/control
18
index 697def8..51372b8 100644
19
--- a/debian/control
20
+++ b/debian/control
21
@@ -10,7 +10,8 @@ Build-Depends: debhelper-compat (= 13),
22
10
               python3-glanceclient,
10
               python3-glanceclient,
23
11
               python3-keystoneclient,
11
               python3-keystoneclient,
24
12
               python3-mock,
12
               python3-mock,
26
13
               python3-nose,
13
               python3-pytest,
27
14
               python3-pytest-cov,
28
14
               python3-requests (>= 1.1),
15
               python3-requests (>= 1.1),
29
15
               python3-setuptools,
16
               python3-setuptools,
30
16
               python3-swiftclient,
17
               python3-swiftclient,
31
diff --git a/tests/unittests/test_contentsource.py b/tests/unittests/test_contentsource.py
32
index 862a147..ef838a2 100644
33
--- a/tests/unittests/test_contentsource.py
34
+++ b/tests/unittests/test_contentsource.py
35
@@ -8,7 +8,7 @@ from simplestreams import objectstores
36
8
from simplestreams import contentsource
8
from simplestreams import contentsource
37
9
from subprocess import Popen, PIPE, STDOUT
9
from subprocess import Popen, PIPE, STDOUT
38
10
from unittest import TestCase, skipIf
10
from unittest import TestCase, skipIf
40
11
from nose.tools import raises
11
import pytest
41
12
12
42
13
13
43
14
class RandomPortServer(object):
14
class RandomPortServer(object):
44
@@ -253,11 +253,11 @@ class TestResume(BaseDirUsingTestCase):
45
253
            # header, so we get two 'hello's.
253
            # header, so we get two 'hello's.
46
254
            assert contents == b'hellohello world\n', contents
254
            assert contents == b'hellohello world\n', contents
47
255
255
48
256
    @raises(Exception)
49
257
    def test_post_open_set_start_pos(self):
256
    def test_post_open_set_start_pos(self):
53
258
        cs = contentsource.UrlContentSource(self.furl_for('foo'))
257
        with pytest.raises(Exception):
54
259
        cs.open()
258
            cs = contentsource.UrlContentSource(self.furl_for('foo'))
55
260
        cs.set_start_pos(1)
259
            cs.open()
56
260
            cs.set_start_pos(1)
57
261
261
58
262
    def test_percent_callback(self):
262
    def test_percent_callback(self):
59
263
        data = {'dld': 0}
263
        data = {'dld': 0}
60
diff --git a/tests/unittests/test_glancemirror.py b/tests/unittests/test_glancemirror.py
61
index cf4195b..53b624c 100644
62
--- a/tests/unittests/test_glancemirror.py
63
+++ b/tests/unittests/test_glancemirror.py
64
@@ -161,7 +161,6 @@ class FakeImages(object):
65
161
        self.image_import_calls.append(image_id)
161
        self.image_import_calls.append(image_id)
66
162
162
67
163
    def list(self, **kwargs):
163
    def list(self, **kwargs):
68
164
        # from nose.tools import set_trace; set_trace()
69
165
        return list(self.imgdb.values())
164
        return list(self.imgdb.values())
70
166
165
71
167
166
72
diff --git a/tests/unittests/test_signed_data.py b/tests/unittests/test_signed_data.py
73
index 02f2dff..2b31e76 100644
74
--- a/tests/unittests/test_signed_data.py
75
+++ b/tests/unittests/test_signed_data.py
76
@@ -2,7 +2,7 @@ import shutil
77
2
import subprocess
2
import subprocess
78
3
import tempfile
3
import tempfile
79
4
4
81
5
from nose.tools import raises
5
import pytest
82
6
from os.path import join
6
from os.path import join
83
7
from simplestreams import mirrors
7
from simplestreams import mirrors
84
8
from simplestreams import objectstores
8
from simplestreams import objectstores
85
@@ -15,27 +15,27 @@ def _tmp_reader():
86
15
    return mirrors.ObjectStoreMirrorReader(sstore)
15
    return mirrors.ObjectStoreMirrorReader(sstore)
87
16
16
88
17
17
89
18
@raises(subprocess.CalledProcessError)
90
19
def test_read_bad_data():
18
def test_read_bad_data():
100
20
    good = join(EXAMPLES_DIR, "foocloud", "streams", "v1", "index.sjson")
19
    with pytest.raises(subprocess.CalledProcessError):
101
21
    bad = join(tempfile.gettempdir(), "index.sjson")
20
        good = join(EXAMPLES_DIR, "foocloud", "streams", "v1", "index.sjson")
102
22
    shutil.copy(good, bad)
21
        bad = join(tempfile.gettempdir(), "index.sjson")
103
23
    with open(bad, 'r+') as f:
22
        shutil.copy(good, bad)
104
24
        lines = f.readlines()
23
        with open(bad, 'r+') as f:
105
25
        f.truncate()
24
            lines = f.readlines()
106
26
        f.seek(0)
25
            f.truncate()
107
27
        for line in lines:
26
            f.seek(0)
108
28
            f.write(line.replace('foovendor', 'attacker'))
27
            for line in lines:
109
28
                f.write(line.replace('foovendor', 'attacker'))
110
29
29
112
30
    _tmp_reader().read_json("index.sjson")
30
        _tmp_reader().read_json("index.sjson")
113
31
31
114
32
32
115
33
@raises(SignatureMissingException)
116
34
def test_read_unsigned():
33
def test_read_unsigned():
119
35
    # empty files aren't signed
34
    with pytest.raises(SignatureMissingException):
120
36
    open(join(tempfile.gettempdir(), 'index.json'), 'w').close()
35
        # empty files aren't signed
121
36
        open(join(tempfile.gettempdir(), 'index.json'), 'w').close()
122
37
37
124
38
    _tmp_reader().read_json("index.json")
38
        _tmp_reader().read_json("index.json")
125
39
39
126
40
40
127
41
def test_read_signed():
41
def test_read_signed():
128
diff --git a/tox.ini b/tox.ini
129
index b450afc..4d09a1b 100644
130
--- a/tox.ini
131
+++ b/tox.ini
132
@@ -8,15 +8,13 @@ setenv =
133
8
commands = 
8
commands = 
134
9
    {toxinidir}/tools/create-gpgdir
9
    {toxinidir}/tools/create-gpgdir
135
10
    {toxinidir}/tools/sign-examples
10
    {toxinidir}/tools/sign-examples
139
11
    {envpython} -m nose {posargs:--with-coverage --cover-erase \
11
    {envpython} -m pytest {posargs:--cov=simplestreams --cov-branch tests}
137
12
        --cover-branches --cover-package=simplestreams --cover-inclusive \
138
13
        tests} 
140
14
deps =
12
deps =
141
15
    coverage
142
16
    mock
13
    mock
143
17
    nose
144
18
    python-glanceclient
14
    python-glanceclient
146
19
    python-keystoneclient 
15
    python-keystoneclient
147
16
    pytest
148
17
    pytest-cov
149
20
18
150
21
[testenv:flake8]
19
[testenv:flake8]
151
22
basepython = python3
20
basepython = python3
152
@@ -27,9 +25,9 @@ commands = {toxinidir}/tools/run-flake8 {posargs}
153
27
25
154
28
[testenv:py3-noopenstack]
26
[testenv:py3-noopenstack]
155
29
deps =
27
deps =
156
30
    coverage
157
31
    mock
28
    mock
159
32
    nose
29
    pytest
160
30
    pytest-cov
161
33
basepython = python3
31
basepython = python3
162
34
32
163
35
[testenv:snap]
33
[testenv:snap]
Reviewer	Review Type	Date Requested	Status
Paride Legovini		2022-09-28	Approve on 2022-09-28
Thomas Bechtold (community)			Approve on 2022-09-28
Server Team CI bot	continuous-integration		Approve on 2022-09-28
Review via email: mp+430635@code.launchpad.net