fixed invalid tests

tests/unittests.cfg

@@ -441,38 +441,23 @@ temporarily disabled
   expect = /contain any keys so far/
 </test>
 
-/*
-disabled, need to re-design invalidkeys.c in order to catch up with new format
-
-<test check-testkey-invalid-id>
+<test invalid>
   prepare = ./invalidkeys
-  cmd = $pcp -V $vault -S -I testkey-invalid-id
-  expect /(invalid key id|could not decode input)/
-</test>
-
-<test check-testkey-not-encrypted>
-  cmd = $pcp -V $vault -S -I testkey-not-encrypted
-  expect = /secret key contained in key seems to be empty/
-</test>
-
-<test check-testkey-wrong-type>
-  cmd = $pcp -V $vault -S -I testkey-wrong-type
-  expect = /key type is not SECRET/
-</test>
 
 <test check-testkey-wrong-version>
-  cmd = $pcp -V $vault -S -I testkey-wrong-version
+  cmd = $pcp -V $vault -S -I testkey-wrong-version -x xxx
   expect = /unknown key version/
 </test>
 
-
-
-<test check-testpubkey-invalid-id>
-  prepare = ./invalidkeys
-  cmd = $pcp -V $vault -P -I testpubkey-invalid-id
-  expect = /(invalid key id|could not decode input)/
+<test check-testkey-wrong-serial>
+  cmd = $pcp -V $vault -S -I testkey-wrong-serial -x xxx
+  expect = /invalid serial number/
 </test>
-
+<test check-testkey-wrong-ctime>
+  cmd = $pcp -V $vault -S -I testkey-invalid-ctime -x xxx
+  expect = /invalid creation timestamp/
+</test>
+/*
 <test check-testpubkey-wrong-type>
   cmd = $pcp -V $vault -P -I testpubkey-wrong-type
   expect = /key type is not PUBLIC/
@@ -482,8 +467,8 @@ disabled, need to re-design invalidkeys.c in order to catch up with new format
   cmd = $pcp -V $vault -P -I testpubkey-wrong-version
   expect = /unknown key version/
 </test>
-
 */
+</test>
 
 <test check-vault-invalid-header>
     prepare = ./invalidkeys