From: Krzysztof Jackiewicz <k.jackiewicz@samsung.com>
Date: Wed, 11 Jan 2017 13:57:47 +0000 (+0100)
Subject: Prevent exceptions in ScopedInstaller destructor
X-Git-Tag: security-manager_5.5_testing~20^2~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ed619dcfee321f05f158ea2e78d8a1803b52008c;p=platform%2Fcore%2Ftest%2Fsecurity-tests.git

Prevent exceptions in ScopedInstaller destructor

Change-Id: Ibc52d27f0c0dd0cdb30233481a70e336b5302a73
---

diff --git a/src/security-manager-tests/common/scoped_installer.h b/src/security-manager-tests/common/scoped_installer.h
index 639aa116..a495dfb0 100644
--- a/src/security-manager-tests/common/scoped_installer.h
+++ b/src/security-manager-tests/common/scoped_installer.h
@@ -31,6 +31,7 @@
 #include <sm_api.h>
 #include <temp_test_user.h>
 #include <synchronization_pipe.h>
+#include <dpl/test/safe_cleanup.h>
 
 class ScopedInstaller {
 public:
@@ -83,7 +84,9 @@ public:
 
     virtual ~ScopedInstaller() {
         if (m_creatorPid == getpid())
-            uninstallApp();
+        {
+            SafeCleanup::run([this]{ uninstallApp(); });
+        }
     }
 
     void uninstallApp() {