Commit c6c56976 authored by FichteFoll's avatar FichteFoll

Aesthetics for tests

isinstance accepts a tuple of types and "donate" used it already,
so we can do the same for author.
parent e9312980
...@@ -136,7 +136,7 @@ class TestContainer(object): ...@@ -136,7 +136,7 @@ class TestContainer(object):
'description': str_cls, 'description': str_cls,
'releases': list, 'releases': list,
'homepage': str_cls, 'homepage': str_cls,
'author': str_cls, 'author': (str_cls, list),
'readme': str_cls, 'readme': str_cls,
'issues': str_cls, 'issues': str_cls,
'donate': (str_cls, type(None)), 'donate': (str_cls, type(None)),
...@@ -219,10 +219,7 @@ class TestContainer(object): ...@@ -219,10 +219,7 @@ class TestContainer(object):
def _test_package(self, include, data): def _test_package(self, include, data):
for k, v in data.items(): for k, v in data.items():
self.assertIn(k, self.package_key_types_map) self.assertIn(k, self.package_key_types_map)
if k == 'author': self.assertIsInstance(v, self.package_key_types_map[k], k)
self.assertIn(type(v), (str_cls, list))
else:
self.assertIsInstance(v, self.package_key_types_map[k], k)
if k == 'donate' and v is None: if k == 'donate' and v is None:
# Allow "removing" the donate url that is added by "details" # Allow "removing" the donate url that is added by "details"
...@@ -250,10 +247,7 @@ class TestContainer(object): ...@@ -250,10 +247,7 @@ class TestContainer(object):
def _test_dependency(self, include, data): def _test_dependency(self, include, data):
for k, v in data.items(): for k, v in data.items():
self.assertIn(k, self.dependency_key_types_map) self.assertIn(k, self.dependency_key_types_map)
if k == 'author': self.assertIsInstance(v, self.dependency_key_types_map[k], k)
self.assertIn(type(v), (str_cls, list))
else:
self.assertIsInstance(v, self.dependency_key_types_map[k], k)
if k == 'issues': if k == 'issues':
self.assertRegex(v, '^https?://') self.assertRegex(v, '^https?://')
...@@ -414,7 +408,7 @@ class TestContainer(object): ...@@ -414,7 +408,7 @@ class TestContainer(object):
def _test_error(self, msg, e=None): def _test_error(self, msg, e=None):
""" """
A generic error-returning function used the meta-programming features A generic error-returning function used by the meta-programming features
of this class. of this class.
:param msg: :param msg:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment