Check test suite with mypy

The test suite has a considerable number of calls to out code so it can
serve as some usage examples that should be type checked.

khard/carddav_object.py

@@ -581,7 +581,7 @@ def organisations(self) -> List[Union[List[str], Dict[str, List[str]]]]:
         """
         return self._get_multi_property("ORG")
 
-    def _add_organisation(self, organisation: StrList) -> None:
+    def _add_organisation(self, organisation: Union[StrList, StrListDict]) -> None:
         """Add one ORG entry to the underlying vcard
 
         :param organisation: the value to add

pyproject.toml

@@ -53,9 +53,10 @@ packages = ['khard', 'khard.helpers']
 write_to = "khard/version.py"
 
 [tool.mypy]
-packages = "khard"
+packages = ["khard", "test"]
 check_untyped_defs = true
 disallow_untyped_calls = true
+#disallow_untyped_defs = true
 warn_redundant_casts = true
 warn_unused_configs = true
 warn_unused_ignores = true
@@ -69,9 +70,15 @@ module = [
     "validate",
     "vobject",
     "vobject.base",
+    "vobject.vcard",
 ]
 ignore_missing_imports = true
 
+[[tool.mypy.overrides]]
+module = "test.*"
+check_untyped_defs = false
+disallow_untyped_calls = false
+
 [tool.pylint.main]
 py-version = "3.8"
 ignore-paths = ["khard/version.py"]

test/helpers.py

@@ -58,16 +58,18 @@ def mock_stream(name="stdout"):
     return context_manager
 
 
-def load_contact(path: str, abook: Optional[address_book.AddressBook] = None
-                 ) -> carddav_object.CarddavObject:
+def load_contact(path: str) -> carddav_object.CarddavObject:
     """Load a contact from the fixture directory.
 
     :param path: the file name (full, relative to cwd or the fixture dir)
-    :param abook:
     """
+    abook = address_book.VdirAddressBook("test", "/tmp")
     if not os.path.exists(path):
         path = os.path.join("test/fixture/vcards", path)
-    return carddav_object.CarddavObject.from_file(abook, path)
+    contact = carddav_object.CarddavObject.from_file(abook, path)
+    if contact is None:
+        raise FileNotFoundError(path)
+    return contact
 
 
 class TmpAbook:

test/test_formatter.py

@@ -4,6 +4,7 @@
 
 from vobject.vcard import Name
 
+from khard.address_book import VdirAddressBook
 from khard.carddav_object import CarddavObject
 from khard.formatter import Formatter
 
@@ -57,7 +58,8 @@ class GetSpecialField(unittest.TestCase):
     _name = Name(family='Family', given='Given', additional='Additional',
                  prefix='Prefix', suffix='Suffix')
     _vcard = CarddavObject(vCard(fn="Formatted Name", n=_name,
-                                 nickname="Nickname"), None, "")
+                                 nickname="Nickname"),
+                           VdirAddressBook("test", "/tmp"), "")
 
     def _test_name(self, fmt, nick, parsable, expected):
         f = Formatter(fmt, [], [], nick, parsable)

test/test_vcard_wrapper.py

@@ -366,7 +366,7 @@ def _test_list_of_strings_as(self, key: str) -> None:
                                                       for item in components}
         expected[key] = ["a", "b"]
         index = components.index(key)
-        components = (*components[:index], ["a", "b"], *components[index+1:])
+        components = (*components[:index], ["a", "b"], *components[index+1:])  # type: ignore
         wrapper._add_post_address('home', *components)
         self.assertDictEqual(wrapper.post_addresses, {'home': [expected]})