1 files changed, 15 insertions, 21 deletions
diff --git a/src/tests/eet/eet_test_identity.c b/src/tests/eet/eet_test_identity.c
index 30ccc8dddc..b22d537021 100644
--- a/src/tests/eet/eet_test_identity.c
+++ b/src/tests/eet/eet_test_identity.c
@@ -52,7 +52,7 @@ badpass_get(char            *pass,
    return strlen(pass);
 }
 
-START_TEST(eet_test_identity_simple)
+EFL_START_TEST(eet_test_identity_simple)
 {
    const char *buffer = "Here is a string of data to save !";
    const void *tmp;
@@ -66,8 +66,6 @@ START_TEST(eet_test_identity_simple)
 
    file = strdup("/tmp/eet_suite_testXXXXXX");
 
-   eet_init();
-
    fail_if(-1 == (fd = mkstemp(file)));
    fail_if(!!close(fd));
    fail_if(!(noread = fopen("/dev/null", "wb")));
@@ -129,49 +127,46 @@ START_TEST(eet_test_identity_simple)
 
    fail_if(unlink(file) != 0);
 
-   eet_shutdown();
 }
-END_TEST
+EFL_END_TEST
 
-START_TEST(eet_test_identity_open_simple)
+EFL_START_TEST(eet_test_identity_open_simple)
 {
    Eet_Key *k = NULL;
 
-   eet_init();
-
    k = eet_identity_open(_cert_pem, _key_pem, NULL);
    fail_if(!k);
 
    if (k)
      eet_identity_close(k);
 
-   eet_shutdown();
 }
-END_TEST
+EFL_END_TEST
 
-START_TEST(eet_test_identity_open_pkcs8)
+EFL_START_TEST(eet_test_identity_open_pkcs8)
 {
    Eet_Key *k = NULL;
 
-   eet_init();
-
    k = eet_identity_open(_cert_pem, _key_enc_none_pem, NULL);
    fail_if(!k);
 
    if (k)
      eet_identity_close(k);
 
-   eet_shutdown();
 }
-END_TEST
+EFL_END_TEST
+
+static int
+pw_cb(char *buf EINA_UNUSED, int size EINA_UNUSED, int rwflag EINA_UNUSED, void *data EINA_UNUSED)
+{
+   return 0;
+}
 
-START_TEST(eet_test_identity_open_pkcs8_enc)
+EFL_START_TEST(eet_test_identity_open_pkcs8_enc)
 {
    Eet_Key *k = NULL;
 
-   eet_init();
-
-   k = eet_identity_open(_cert_pem, _key_enc_pem, NULL);
+   k = eet_identity_open(_cert_pem, _key_enc_pem, pw_cb);
    fail_if(k);
 
    if (k)
@@ -189,9 +184,8 @@ START_TEST(eet_test_identity_open_pkcs8_enc)
    if (k)
      eet_identity_close(k);
 
-   eet_shutdown();
 }
-END_TEST
+EFL_END_TEST
 
 static const char *_cert_dir_find(const char *_argv0)
 {