From 59df833ca5fb80c596df621a24dc461a550dba71 Mon Sep 17 00:00:00 2001 From: Rob Crittenden Date: Tue, 27 Aug 2019 18:01:02 +0000 Subject: [PATCH] Update tests to include the security module DB in expected output certmonger was previously always initializing the databases with the flag NSS_INIT_NOMODDB but in at elast NSS 3.44 this doesn't seem to initialize external modules (tested with SoftHSM2). https://pagure.io/certmonger/issue/125 --- tests/034-perms-dbm/expected.out | 16 ++++++++++++++++ tests/034-perms-sql/expected.out | 16 ++++++++++++++++ tests/034-perms/expected.out | 16 ++++++++++++++++ 3 files changed, 48 insertions(+) diff --git a/tests/034-perms-dbm/expected.out b/tests/034-perms-dbm/expected.out index c062d409..7bf23a37 100644 --- a/tests/034-perms-dbm/expected.out +++ b/tests/034-perms-dbm/expected.out @@ -45,50 +45,66 @@ $owner:$group|0620|ee.key [dbm:keygen] $owner:$group|0600|cert8.db $owner:$group|0620|key3.db +$owner:$group|0600|secmod.db [dbm:reset] $owner:$group|0755|cert8.db $owner:$group|0755|key3.db +$owner:$group|0755|secmod.db [dbm:csrgen] $owner:$group|0755|cert8.db $owner:$group|0620|key3.db +$owner:$group|0755|secmod.db [dbm:reset] $owner:$group|0755|cert8.db $owner:$group|0755|key3.db +$owner:$group|0755|secmod.db [dbm:submit] $owner:$group|0755|cert8.db $owner:$group|0755|key3.db +$owner:$group|0755|secmod.db [dbm:reset] $owner:$group|0755|cert8.db $owner:$group|0755|key3.db +$owner:$group|0755|secmod.db [dbm:save] $owner:$group|0662|cert8.db $owner:$group|0620|key3.db +$owner:$group|0662|secmod.db [rekey:dbm:start] [rekey:dbm:keygen] $owner:$group|0600|cert8.db $owner:$group|0620|key3.db +$owner:$group|0600|secmod.db [rekey:dbm:reset] $owner:$group|0755|cert8.db $owner:$group|0755|key3.db +$owner:$group|0755|secmod.db [rekey:dbm:keygen] $owner:$group|0755|cert8.db $owner:$group|0620|key3.db +$owner:$group|0755|secmod.db [rekey:dbm:reset] $owner:$group|0755|cert8.db $owner:$group|0755|key3.db +$owner:$group|0755|secmod.db [rekey:dbm:csrgen] $owner:$group|0755|cert8.db $owner:$group|0620|key3.db +$owner:$group|0755|secmod.db [rekey:dbm:reset] $owner:$group|0755|cert8.db $owner:$group|0755|key3.db +$owner:$group|0755|secmod.db [rekey:dbm:submit] $owner:$group|0755|cert8.db $owner:$group|0755|key3.db +$owner:$group|0755|secmod.db [rekey:dbm:reset] $owner:$group|0755|cert8.db $owner:$group|0755|key3.db +$owner:$group|0755|secmod.db [rekey:dbm:save] $owner:$group|0662|cert8.db $owner:$group|0620|key3.db +$owner:$group|0662|secmod.db OK diff --git a/tests/034-perms-sql/expected.out b/tests/034-perms-sql/expected.out index 2808e02c..c5914e02 100644 --- a/tests/034-perms-sql/expected.out +++ b/tests/034-perms-sql/expected.out @@ -45,50 +45,66 @@ $owner:$group|0620|ee.key [sql:keygen] $owner:$group|0600|cert9.db $owner:$group|0620|key4.db +$owner:$group|0600|pkcs11.txt [sql:reset] $owner:$group|0755|cert9.db $owner:$group|0755|key4.db +$owner:$group|0755|pkcs11.txt [sql:csrgen] $owner:$group|0755|cert9.db $owner:$group|0620|key4.db +$owner:$group|0755|pkcs11.txt [sql:reset] $owner:$group|0755|cert9.db $owner:$group|0755|key4.db +$owner:$group|0755|pkcs11.txt [sql:submit] $owner:$group|0755|cert9.db $owner:$group|0755|key4.db +$owner:$group|0755|pkcs11.txt [sql:reset] $owner:$group|0755|cert9.db $owner:$group|0755|key4.db +$owner:$group|0755|pkcs11.txt [sql:save] $owner:$group|0662|cert9.db $owner:$group|0620|key4.db +$owner:$group|0662|pkcs11.txt [rekey:sql:start] [rekey:sql:keygen] $owner:$group|0600|cert9.db $owner:$group|0620|key4.db +$owner:$group|0600|pkcs11.txt [rekey:sql:reset] $owner:$group|0755|cert9.db $owner:$group|0755|key4.db +$owner:$group|0755|pkcs11.txt [rekey:sql:keygen] $owner:$group|0755|cert9.db $owner:$group|0620|key4.db +$owner:$group|0755|pkcs11.txt [rekey:sql:reset] $owner:$group|0755|cert9.db $owner:$group|0755|key4.db +$owner:$group|0755|pkcs11.txt [rekey:sql:csrgen] $owner:$group|0755|cert9.db $owner:$group|0620|key4.db +$owner:$group|0755|pkcs11.txt [rekey:sql:reset] $owner:$group|0755|cert9.db $owner:$group|0755|key4.db +$owner:$group|0755|pkcs11.txt [rekey:sql:submit] $owner:$group|0755|cert9.db $owner:$group|0755|key4.db +$owner:$group|0755|pkcs11.txt [rekey:sql:reset] $owner:$group|0755|cert9.db $owner:$group|0755|key4.db +$owner:$group|0755|pkcs11.txt [rekey:sql:save] $owner:$group|0662|cert9.db $owner:$group|0620|key4.db +$owner:$group|0662|pkcs11.txt OK diff --git a/tests/034-perms/expected.out b/tests/034-perms/expected.out index c062d409..7bf23a37 100644 --- a/tests/034-perms/expected.out +++ b/tests/034-perms/expected.out @@ -45,50 +45,66 @@ $owner:$group|0620|ee.key [dbm:keygen] $owner:$group|0600|cert8.db $owner:$group|0620|key3.db +$owner:$group|0600|secmod.db [dbm:reset] $owner:$group|0755|cert8.db $owner:$group|0755|key3.db +$owner:$group|0755|secmod.db [dbm:csrgen] $owner:$group|0755|cert8.db $owner:$group|0620|key3.db +$owner:$group|0755|secmod.db [dbm:reset] $owner:$group|0755|cert8.db $owner:$group|0755|key3.db +$owner:$group|0755|secmod.db [dbm:submit] $owner:$group|0755|cert8.db $owner:$group|0755|key3.db +$owner:$group|0755|secmod.db [dbm:reset] $owner:$group|0755|cert8.db $owner:$group|0755|key3.db +$owner:$group|0755|secmod.db [dbm:save] $owner:$group|0662|cert8.db $owner:$group|0620|key3.db +$owner:$group|0662|secmod.db [rekey:dbm:start] [rekey:dbm:keygen] $owner:$group|0600|cert8.db $owner:$group|0620|key3.db +$owner:$group|0600|secmod.db [rekey:dbm:reset] $owner:$group|0755|cert8.db $owner:$group|0755|key3.db +$owner:$group|0755|secmod.db [rekey:dbm:keygen] $owner:$group|0755|cert8.db $owner:$group|0620|key3.db +$owner:$group|0755|secmod.db [rekey:dbm:reset] $owner:$group|0755|cert8.db $owner:$group|0755|key3.db +$owner:$group|0755|secmod.db [rekey:dbm:csrgen] $owner:$group|0755|cert8.db $owner:$group|0620|key3.db +$owner:$group|0755|secmod.db [rekey:dbm:reset] $owner:$group|0755|cert8.db $owner:$group|0755|key3.db +$owner:$group|0755|secmod.db [rekey:dbm:submit] $owner:$group|0755|cert8.db $owner:$group|0755|key3.db +$owner:$group|0755|secmod.db [rekey:dbm:reset] $owner:$group|0755|cert8.db $owner:$group|0755|key3.db +$owner:$group|0755|secmod.db [rekey:dbm:save] $owner:$group|0662|cert8.db $owner:$group|0620|key3.db +$owner:$group|0662|secmod.db OK -- 2.21.0