key.c, catacomb/__init__.py: Split key file I/O into Python and C pieces.

[catacomb-python] / t / t-key.py

diff --git a/t/t-key.py b/t/t-key.py
index e81217e..c33ea72 100644 (file)
--- a/t/t-key.py
+++ b/t/t-key.py
@@ -169,10 +169,14 @@ class TestKeyFile (U.TestCase):
     me.assertRaises(TypeError, kf.bytype, 12345)
     me.assertRaises(C.KeyError, kf.byid, 0x12345678)
 
+    me.assertRaises(C.KeyError, kf.mergeline, "nowhere", 2, "")
+
     ## The keyring should be readonly.
     me.assertRaises(C.KeyError, kf.newkey, 0x12345678, "fail")
     me.assertRaises(C.KeyError, setattr, k, "tag", "foo")
     me.assertRaises(C.KeyError, delattr, k, "tag")
+    me.assertRaises(C.KeyError, kf.mergeline, "notexist", 1,
+                    "22222222:test integer,public:32519164 forever forever -")
     me.assertRaises(C.KeyError, setattr, k, "data", C.KeyDataString("foo"))
 
   def test_keywrite(me):
@@ -204,6 +208,9 @@ class TestKeyFile (U.TestCase):
     del k.comment
     me.assertEqual(k.comment, None)
 
+    kf.mergeline("notexist", 1,
+                 "22222222:test integer,public:32519164 forever forever -")
+
 ###--------------------------------------------------------------------------
 
 def keydata_equalp(kd0, kd1):