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 639aa1164400d7337c7a709e185c19dd8548e313..a495dfb09025e23cf4ec33c0fe38ce3c452e91d1 100644 (file)
--- 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() {