diff options
author | Arthur Zamarin <arthurzam@gentoo.org> | 2022-08-26 17:41:34 +0300 |
---|---|---|
committer | Arthur Zamarin <arthurzam@gentoo.org> | 2022-08-26 17:41:34 +0300 |
commit | 211009d8c43104b0d9a66c9dd1f65ec28def6ed2 (patch) | |
tree | 0fff3b1a4456e6b4e4f6a761add0be453f098611 /tests | |
parent | tests: remove various extensions (diff) | |
download | pkgcore-211009d8c43104b0d9a66c9dd1f65ec28def6ed2.tar.gz pkgcore-211009d8c43104b0d9a66c9dd1f65ec28def6ed2.tar.bz2 pkgcore-211009d8c43104b0d9a66c9dd1f65ec28def6ed2.zip |
package/test_*.py: modernize tests to pytest
Signed-off-by: Arthur Zamarin <arthurzam@gentoo.org>
Diffstat (limited to 'tests')
-rw-r--r-- | tests/package/test_base.py | 53 | ||||
-rw-r--r-- | tests/package/test_metadata.py | 15 | ||||
-rw-r--r-- | tests/package/test_mutated.py | 21 |
3 files changed, 45 insertions, 44 deletions
diff --git a/tests/package/test_base.py b/tests/package/test_base.py index cd5465ca4..5e99f1596 100644 --- a/tests/package/test_base.py +++ b/tests/package/test_base.py @@ -1,20 +1,19 @@ from functools import partial from types import SimpleNamespace +import pytest from pkgcore.package import base -from snakeoil.test import TestCase def fake_pkg(cat='dev-util', pkg='bsdiff', ver='1.0', **attrs): - d = {} - d['category'] = cat - d['pkg'] = pkg - d['ver'] = ver - d['key'] = f"{cat}/{pkg}" - d["cpvstr"] = f"{cat}/{pkg}-{ver}" - d['built'] = False - d.update(attrs) - return SimpleNamespace(**d) + return SimpleNamespace(**({ + 'category': cat, + 'pkg': pkg, + 'ver': ver, + 'key': f"{cat}/{pkg}", + "cpvstr": f"{cat}/{pkg}-{ver}", + "built": False, + } | attrs)) class mixin: @@ -23,24 +22,27 @@ class mixin: raise NotImplementedError(self, "mk_inst") def test_setattr(self): - self.assertRaises(AttributeError, setattr, - self.mk_inst(), "asdf", 1) + with pytest.raises(AttributeError): + setattr(self.mk_inst(), "asdf", 1) def test_delattr(self): - self.assertRaises(AttributeError, delattr, - self.mk_inst(), "asdf") + with pytest.raises(AttributeError): + delattr(self.mk_inst(), "asdf") -class TestBasePkg(mixin, TestCase): +class TestBasePkg(mixin): mk_inst = kls = staticmethod(base.base) def test_properties(self): o = self.kls() for f in ("versioned_atom", "unversioned_atom"): - self.assertRaises(NotImplementedError, getattr, o, f) - self.assertRaises(AttributeError, o.__setattr__, f, "a") - self.assertRaises(AttributeError, o.__delattr__, f) + with pytest.raises(NotImplementedError): + getattr(o, f) + with pytest.raises(AttributeError): + o.__setattr__(f, "a") + with pytest.raises(AttributeError): + o.__delattr__(f) def test_getattr(self): class Class(base.base): @@ -52,12 +54,12 @@ class TestBasePkg(mixin, TestCase): o = Class() for x in range(10): - self.assertEqual(getattr(o, str(x)), x) - self.assertEqual(o.a, "foo") - self.assertEqual(self.mk_inst().built, False) + assert getattr(o, str(x)) == x + assert o.a == "foo" + assert not self.mk_inst().built -class TestWrapper(mixin, TestCase): +class TestWrapper(mixin): kls = base.wrapper @@ -73,8 +75,7 @@ class TestWrapper(mixin, TestCase): def test_built_passthru(self): # test pass thrus - self.assertEqual(self.mk_inst().built, False) - self.assertEqual(self.mk_inst(built=True).built, True) + assert not self.mk_inst().built + assert self.mk_inst(built=True).built # verify that wrapping will override it - self.assertEqual(self.mk_inst(overrides={'built':False}, - built=True).built, False) + assert not self.mk_inst(overrides={'built':False}, built=True).built diff --git a/tests/package/test_metadata.py b/tests/package/test_metadata.py index cdb3130aa..450afd2a2 100644 --- a/tests/package/test_metadata.py +++ b/tests/package/test_metadata.py @@ -1,5 +1,4 @@ from pkgcore.package import base, metadata -from snakeoil.test import TestCase def make_pkg_kls(attrs=(), callbacks={}): @@ -26,7 +25,7 @@ def make_pkg_kls(attrs=(), callbacks={}): return metadata_pkg -class TestMetadataPackage(TestCase): +class TestMetadataPackage: def test_init(self): class repo: @@ -34,13 +33,13 @@ class TestMetadataPackage(TestCase): kls = make_pkg_kls() o = kls(repo, "monkeys", dar=1) - self.assertEqual(o._parent, repo) - self.assertEqual(o.repo, "foon") - self.assertEqual(o._args, ("monkeys",)) - self.assertEqual(o._kwds, {"dar":1}) - self.assertEqual(o._fetch_called, False) + assert o._parent == repo + assert o.repo == "foon" + assert o._args == ("monkeys",) + assert o._kwds == {"dar": 1} + assert not o._fetch_called def test_getdata(self): kls = make_pkg_kls() o = kls(None, data={'a': 'b'}) - self.assertEqual(o.data, {'a': 'b'}) + assert o.data == {'a': 'b'} diff --git a/tests/package/test_mutated.py b/tests/package/test_mutated.py index 67bc380ea..0e6b208e2 100644 --- a/tests/package/test_mutated.py +++ b/tests/package/test_mutated.py @@ -1,10 +1,10 @@ from functools import partial +import pytest from pkgcore.package.base import base, dynamic_getattr_dict from pkgcore.package.mutated import MutatedPkg from snakeoil.compatibility import cmp from snakeoil.klass import inject_richcmp_methods_from_cmp -from snakeoil.test import TestCase def passthru(val, self): @@ -31,7 +31,7 @@ class FakePkg(base): inject_richcmp_methods_from_cmp(locals()) -class TestMutatedPkg(TestCase): +class TestMutatedPkg: def make_fakepkg(self, pkg="dar", ver=1, data=None): if data is None: @@ -40,7 +40,7 @@ class TestMutatedPkg(TestCase): def test_raw_pkg(self): pkg = self.make_fakepkg() - self.assertIdentical(MutatedPkg(pkg, {})._raw_pkg, pkg) + assert MutatedPkg(pkg, {})._raw_pkg is pkg def test_cmp(self): pkg1 = self.make_fakepkg() @@ -49,13 +49,14 @@ class TestMutatedPkg(TestCase): mpkg2 = MutatedPkg(pkg2, {}) for lpkg in (pkg1, mpkg1): - self.assertTrue(cmp(lpkg, mpkg2) < 0) - self.assertTrue(cmp(mpkg2, lpkg) > 0) - self.assertEqual(mpkg1, mpkg1) - self.assertEqual(pkg1, mpkg1) + assert cmp(lpkg, mpkg2) < 0 + assert cmp(mpkg2, lpkg) > 0 + assert mpkg1 == mpkg1 + assert pkg1 == mpkg1 def test_getattr(self): pkg = self.make_fakepkg() - self.assertEqual(MutatedPkg(pkg, {}).a, 1) - self.assertEqual(MutatedPkg(pkg, {"a":2}).a, 2) - self.assertRaises(AttributeError, MutatedPkg(pkg, {}).__getattr__, "b") + assert MutatedPkg(pkg, {}).a == 1 + assert MutatedPkg(pkg, {"a":2}).a == 2 + with pytest.raises(AttributeError): + getattr(MutatedPkg(pkg, {}), "b") |