crypto,fcrypt, gpgme: kill gpg-agent after unit test is done.

Hopefully once and for all fixes the infamous ElektraInitiative#1973 .
petermax2 · Sep 23, 2018 · cb9c983 · cb9c983
1 parent a23119b
commit cb9c983
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 0 deletions.
diff --git a/src/plugins/crypto/test_internals.h b/src/plugins/crypto/test_internals.h
@@ -33,6 +33,7 @@ static KeySet * newPluginConfiguration (void);
 		test_init (PLUGIN_NAME);                                                                                                   \
 		test_incomplete_config (PLUGIN_NAME);                                                                                      \
 		test_crypto_operations (PLUGIN_NAME);                                                                                      \
+		test_teardown ();                                                                                                          \
 	}                                                                                                                                  \
 	else                                                                                                                               \
 	{                                                                                                                                  \
@@ -149,6 +150,11 @@ static void test_init (const char * pluginName)
 	keyDel (parentKey);
 }
 
+static void test_teardown (void)
+{
+	succeed_if (system ("gpg-connect-agent --quiet KILLAGENT /bye") == 0, "failed to kill the gpg-agent");
+}
+
 static void test_incomplete_config (const char * pluginName)
 {
 	Plugin * plugin = NULL;

diff --git a/src/plugins/fcrypt/testmod_fcrypt.c b/src/plugins/fcrypt/testmod_fcrypt.c
@@ -115,6 +115,11 @@ static int isTestFileCorrect (const char * file)
 	return returnValue;
 }
 
+static void test_teardown (void)
+{
+	succeed_if (system ("gpg-connect-agent --quiet KILLAGENT /bye") == 0, "failed to kill the gpg-agent");
+}
+
 static void test_init (void)
 {
 	Plugin * plugin = NULL;
@@ -300,6 +305,7 @@ int main (int argc, char ** argv)
 	test_file_crypto_operations ();
 	test_file_signature_operations ();
 	test_file_faulty_signature ();
+	test_teardown ();
 
 	print_result (ELEKTRA_PLUGIN_NAME);
 	return nbError;

diff --git a/src/plugins/gpgme/testmod_gpgme.c b/src/plugins/gpgme/testmod_gpgme.c
@@ -81,6 +81,11 @@ static KeySet * newTestdataKeySet (void)
 	return ksNew (4, kUnchanged, kNull, kString, kBin, KS_END);
 }
 
+static void test_teardown (void)
+{
+	succeed_if (system ("gpg-connect-agent --quiet KILLAGENT /bye") == 0, "failed to kill the gpg-agent");
+}
+
 static void test_import_key (void)
 {
 	gpgme_error_t err;
@@ -282,6 +287,7 @@ int main (int argc, char ** argv)
 	test_init ();
 	test_incomplete_config ();
 	test_encryption_decryption ();
+	test_teardown ();
 
 	print_result ("gpgme");
 	return nbError;