Add cleanupApp() helper. It should be called after app termination.

Change-Id: I8664aca14bce9f6c7146a68d512ec830d5763942

diff --git a/src/common/sm_api.cpp b/src/common/sm_api.cpp
index d7ab650..7f07a86 100644 (file)
--- a/src/common/sm_api.cpp
+++ b/src/common/sm_api.cpp
@@ -99,6 +99,17 @@ void prepareApp(const std::string &appId, lib_retcode expectedResult)
                           << " Expected result: " << expectedResult);
 }
 
+void cleanupApp(const std::string &appId, uid_t uid, lib_retcode expectedResult)
+{
+    int result = security_manager_cleanup_app(appId.c_str(), uid);
+    RUNNER_ASSERT_MSG((lib_retcode)result == expectedResult,
+                      "cleanup app returned wrong value."
+                          << " App id: " << appId << ";"
+                          << " user id: " << uid << ";"
+                          << " Result: " << result << ";"
+                          << " Expected result: " << expectedResult);
+}
+
 void addUser(const UserRequest &request, lib_retcode expectedResult)
 {
     int result = security_manager_user_add(request.get());

diff --git a/src/common/sm_api.h b/src/common/sm_api.h
index ca1fb6d..e1c8efe 100644 (file)
--- a/src/common/sm_api.h
+++ b/src/common/sm_api.h
@@ -36,6 +36,7 @@ void setProcessLabel(const std::string &appId, lib_retcode expectedResult = SECU
 void setProcessGroups(const std::string &appId, lib_retcode expectedResult = SECURITY_MANAGER_SUCCESS);
 void dropProcessPrivileges(lib_retcode expectedResult = SECURITY_MANAGER_SUCCESS);
 void prepareApp(const std::string &appId, lib_retcode expectedResult = SECURITY_MANAGER_SUCCESS);
+void cleanupApp(const std::string &appId, uid_t uid, lib_retcode expectedResult = SECURITY_MANAGER_SUCCESS);
 void addUser(const UserRequest &request, lib_retcode expectedResult = SECURITY_MANAGER_SUCCESS);
 void deleteUser(const UserRequest &request, lib_retcode expectedResult = SECURITY_MANAGER_SUCCESS);
 void sendPolicy(const PolicyRequest &request, lib_retcode expectedResult = SECURITY_MANAGER_SUCCESS);

diff --git a/src/security-manager-tests/test_cases_prepare_app.cpp b/src/security-manager-tests/test_cases_prepare_app.cpp
index 7c366a3..844c4dc 100644 (file)
--- a/src/security-manager-tests/test_cases_prepare_app.cpp
+++ b/src/security-manager-tests/test_cases_prepare_app.cpp
@@ -198,6 +198,7 @@ RUNNER_CHILD_TEST(security_manager_100_synchronize_credentials_test)
         exit(0);
     } else {
         waitPid(pid);
+        Api::cleanupApp(app.getAppId().c_str(), tmpUser.getUid());
     }
 }
 
@@ -243,6 +244,7 @@ RUNNER_CHILD_TEST(security_manager_101_create_namespace_test)
 
         synchPipe.post();
         waitPid(pid);
+        Api::cleanupApp(app.getAppId().c_str(), tmpUser.getUid());
     }
 }
 
@@ -286,6 +288,7 @@ RUNNER_CHILD_TEST(security_manager_102_check_propagation_test)
 
         synchPipe.post();
         waitPid(pid);
+        Api::cleanupApp(app.getAppId().c_str(), tmpUser.getUid());
     }
 }
 
@@ -357,5 +360,6 @@ RUNNER_CHILD_TEST(security_manager_103_policy_change_test)
 
         synchPipe.post();
         waitPid(pid);
+        Api::cleanupApp(app.getAppId().c_str(), tmpUser.getUid());
     }
 }