diff --git a/.gitignore b/.gitignore index 796332b4..1b429513 100644 --- a/.gitignore +++ b/.gitignore @@ -78,6 +78,9 @@ Flatpak-1.0.* /tests/test-keyring/.gpg-v21-migrated /tests/test-keyring/private-keys-v1.d/ /tests/test-keyring/trustdb.gpg +/tests/test-keyring2/.gpg-v21-migrated +/tests/test-keyring2/private-keys-v1.d/ +/tests/test-keyring2/trustdb.gpg /tests/hello*.flatpak /tests/platform*.flatpak /tests/repo diff --git a/tests/libtest.sh b/tests/libtest.sh index d4a22c28..d0618f2b 100644 --- a/tests/libtest.sh +++ b/tests/libtest.sh @@ -170,12 +170,17 @@ assert_file_empty() { } export FL_GPG_HOMEDIR=${TEST_DATA_DIR}/gpghome +export FL_GPG_HOMEDIR2=${TEST_DATA_DIR}/gpghome2 mkdir -p ${FL_GPG_HOMEDIR} +mkdir -p ${FL_GPG_HOMEDIR2} # This need to be writable, so copy the keys cp $(dirname $0)/test-keyring/*.gpg ${FL_GPG_HOMEDIR}/ +cp $(dirname $0)/test-keyring2/*.gpg ${FL_GPG_HOMEDIR2}/ export FL_GPG_ID=7B0961FD +export FL_GPG_ID2=B2314EFC export FL_GPGARGS="--gpg-homedir=${FL_GPG_HOMEDIR} --gpg-sign=${FL_GPG_ID}" +export FL_GPGARGS2="--gpg-homedir=${FL_GPG_HOMEDIR2} --gpg-sign=${FL_GPG_ID2}" setup_repo () { REPONAME=${1:-test} diff --git a/tests/test-keyring2/README b/tests/test-keyring2/README new file mode 100644 index 00000000..7586ed3e --- /dev/null +++ b/tests/test-keyring2/README @@ -0,0 +1,3 @@ +These are completely random keys, which include the secret key. +Use these for testing gpg signing, do *NOT* ever use these for any +real application. diff --git a/tests/test-keyring2/pubring.gpg b/tests/test-keyring2/pubring.gpg new file mode 100644 index 00000000..f5bf51a5 Binary files /dev/null and b/tests/test-keyring2/pubring.gpg differ diff --git a/tests/test-keyring2/secring.gpg b/tests/test-keyring2/secring.gpg new file mode 100644 index 00000000..321581d9 Binary files /dev/null and b/tests/test-keyring2/secring.gpg differ