X-Git-Url: https://git.distorted.org.uk/~mdw/catacomb-python/blobdiff_plain/c25a8ca2ca292a5bb03446410c1f51975e45774c..f205cc7ab59d556b20f9b00bccd336eaacd6e489:/t/t-key.py

diff --git a/t/t-key.py b/t/t-key.py
index 9e3646f..27808a4 100644
--- a/t/t-key.py
+++ b/t/t-key.py
@@ -163,11 +163,14 @@ class TestKeyFile (U.TestCase):
 
     ## Check unsuccessful searches.
     me.assertRaises(KeyError, lambda: kf["notexist"])
-    me.assertEqual(kf.bytag("notexist"), None)
-    me.assertEqual(kf.bytag(12345), None)
-    me.assertEqual(kf.bytype("notexist"), None)
+    me.assertRaises(C.KeyError, kf.bytag, "notexist")
+    me.assertRaises(C.KeyError, kf.bytag, 12345)
+    me.assertEqual(kf.bytag("notexist", fail = False), None)
+    me.assertRaises(C.KeyError, kf.bytype, "notexist")
     me.assertRaises(TypeError, kf.bytype, 12345)
+    me.assertEqual(kf.bytype("notexist", fail = False), None)
     me.assertRaises(C.KeyError, kf.byid, 0x12345678)
+    me.assertEqual(kf.byid(0x12345678, fail = False), None)
 
     me.assertRaises(C.KeyError, kf.mergeline, "nowhere", 2, "")
 
@@ -295,6 +298,9 @@ class TestKeyData (U.TestCase):
     me.assertEqual(len(kd), 4)
     me.check_encode(kd)
     me.assertRaises(TypeError, C.KeyDataStructured, { "a": "a" })
+    me.assertRaises(ValueError, C.KeyDataStructured,
+                    { "a": C.KeyDataString("a") },
+                    a = C.KeyDataString("b"))
 
 ###--------------------------------------------------------------------------
 ### Mappings.