From 22e11617bbc55ce889f835a7ccf3440b633a398f Mon Sep 17 00:00:00 2001 From: Krzysztof Jackiewicz Date: Fri, 7 Jun 2024 11:50:03 +0200 Subject: [PATCH] Fix systemdb tests Add missing database cleanup to system db tests. Fix failing T5044_SYSTEM_SVC_5000_ACCESS_DB. The expected error is CKMC_ERROR_DB_ALIAS_UNKNOWN because user 5000 is not a system service and does not know about the alias stored in the system db. Change-Id: I824cd1d3c6504a67215a9094eaa510849d1330bc --- src/ckm/privileged/system-db.cpp | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/src/ckm/privileged/system-db.cpp b/src/ckm/privileged/system-db.cpp index 582446a1..256a97ba 100644 --- a/src/ckm/privileged/system-db.cpp +++ b/src/ckm/privileged/system-db.cpp @@ -58,7 +58,7 @@ const char* TEST_DATA = RUNNER_TEST_GROUP_INIT(T50_SYSTEM_DB); -RUNNER_TEST(T5010_ACCESS_SYSTEM_DB, RemoveDataEnv<0>) +RUNNER_TEST(T5010_ACCESS_SYSTEM_DB, RemoveDataEnv<0, USER_ID>) { // [prepare] // start as system service @@ -82,7 +82,7 @@ RUNNER_TEST(T5010_ACCESS_SYSTEM_DB, RemoveDataEnv<0>) check_read(TEST_ALIAS, SYSTEM_LABEL, TEST_DATA, CKMC_ERROR_DB_LOCKED); } -RUNNER_TEST(T5020_CLIENT_APP_ADD_TO_PRIVATE_DB) +RUNNER_TEST(T5020_CLIENT_APP_ADD_TO_PRIVATE_DB, RemoveDataEnv) { // [test] // switch to user app, unlock DB @@ -91,7 +91,6 @@ RUNNER_TEST(T5020_CLIENT_APP_ADD_TO_PRIVATE_DB) // try to get item from private DB - expect success // [test] - remove_user_data(USER_ID); ScopedDBUnlock unlock(USER_ID, APP_PASS); ScopedAppContext ctx(TEST_LABEL, USER_ID, GROUP_ID); @@ -289,7 +288,7 @@ RUNNER_TEST(T5037_CLIENT_APP_TRY_GENERATE_KEY_IN_SYSTEM_DB, RemoveDataEnv) +RUNNER_TEST(T5038_CLIENT_SERVER_CREATE_VERIFY_SYSTEM_DB, RemoveDataEnv<0, USER_ID>) { // [prepare] // start as system service @@ -397,7 +396,7 @@ RUNNER_TEST(T5040_SYSTEM_SVC_ACCESS_DB, RemoveDataEnv<0>) check_read(TEST_ALIAS, SYSTEM_LABEL, TEST_DATA); } -RUNNER_TEST(T5041_SYSTEM_SVC_1234_ACCESS_DB, RemoveDataEnv<0>) +RUNNER_TEST(T5041_SYSTEM_SVC_1234_ACCESS_DB, RemoveDataEnv<0, SERVICE_USER_ID_2>) { // [prepare] // start as system service @@ -415,7 +414,7 @@ RUNNER_TEST(T5041_SYSTEM_SVC_1234_ACCESS_DB, RemoveDataEnv<0>) check_read(TEST_ALIAS, SYSTEM_LABEL, TEST_DATA); } -RUNNER_TEST(T5042_SYSTEM_SVC_1234_ADD_ITEM_TO_DB) +RUNNER_TEST(T5042_SYSTEM_SVC_1234_ADD_ITEM_TO_DB, RemoveDataEnv<0, SERVICE_USER_ID_2>) { // [prepare] // start as system service 1234 @@ -432,7 +431,7 @@ RUNNER_TEST(T5042_SYSTEM_SVC_1234_ADD_ITEM_TO_DB) check_read(TEST_ALIAS, SYSTEM_LABEL, TEST_DATA); } -RUNNER_TEST(T5043_SYSTEM_SVC_4999_ACCESS_DB, RemoveDataEnv<0>) +RUNNER_TEST(T5043_SYSTEM_SVC_4999_ACCESS_DB, RemoveDataEnv<0, SERVICE_USER_ID_MAX>) { // [prepare] // start as system service @@ -450,7 +449,7 @@ RUNNER_TEST(T5043_SYSTEM_SVC_4999_ACCESS_DB, RemoveDataEnv<0>) check_read(TEST_ALIAS, SYSTEM_LABEL, TEST_DATA); } -RUNNER_TEST(T5044_SYSTEM_SVC_5000_ACCESS_DB, RemoveDataEnv<0>) +RUNNER_TEST(T5044_SYSTEM_SVC_5000_ACCESS_DB, RemoveDataEnv<0, SERVICE_USER_ID_FAIL>) { // [prepare] // start as system service @@ -465,7 +464,7 @@ RUNNER_TEST(T5044_SYSTEM_SVC_5000_ACCESS_DB, RemoveDataEnv<0>) // [test] ScopedAppContext ctx(TEST_LABEL_2, SERVICE_USER_ID_FAIL, SERVICE_GROUP_ID_FAIL); - check_read(TEST_ALIAS, SYSTEM_LABEL, TEST_DATA, CKMC_ERROR_DB_LOCKED); + check_read(TEST_ALIAS, SYSTEM_LABEL, TEST_DATA, CKMC_ERROR_DB_ALIAS_UNKNOWN); } RUNNER_TEST(T5045_SYSTEM_DB_ADD_WITH_INVALID_LABEL, RemoveDataEnv<0>) -- 2.34.1