SM : Fix ScopedInstaller - use request uid in destructor

Change-Id: Ifa6a21d8db5390c2fa64f6d3c4b6b81098d5c767

diff --git a/src/security-manager-tests/common/scoped_installer.h b/src/security-manager-tests/common/scoped_installer.h
index 404bd2be1237e9778cfc1f0c403d609c7037a573..582ea1dae7816a6be70371273b7a1ac9dd85b172 100644 (file)
--- a/src/security-manager-tests/common/scoped_installer.h
+++ b/src/security-manager-tests/common/scoped_installer.h
@@ -36,7 +36,8 @@
 class ScopedInstaller {
 public:
     ScopedInstaller(const AppInstallHelper &appInstallHelper, bool requestUid = true)
-        : m_appInstallHelper(appInstallHelper), m_shouldUninstall(true), m_creatorPid(getpid())
+        : m_appInstallHelper(appInstallHelper), m_shouldUninstall(true), m_requestUid(requestUid),
+          m_creatorPid(getpid())
     {
         SecurityManagerTest::InstallRequest instReq;
 
@@ -74,7 +75,8 @@ public:
             return;
         SecurityManagerTest::InstallRequest uninstReq;
         uninstReq.setAppId(m_appInstallHelper.getAppId());
-        uninstReq.setUid(m_appInstallHelper.getUID());
+        if (m_requestUid)
+            uninstReq.setUid(m_appInstallHelper.getUID());
 
         SecurityManagerTest::Api::uninstall(uninstReq);
         m_shouldUninstall = false;
@@ -87,5 +89,6 @@ public:
 protected:
     AppInstallHelper m_appInstallHelper;
     bool m_shouldUninstall;
+    bool m_requestUid;
     pid_t m_creatorPid;
 };