security-manager-tests: fix and re-enable ignored tests

Turn on the following previously disabled tests:
- security_manager_15_privacy_manager_send_policy_update_for_admin
- security_manager_15_privacy_manager_send_policy_update_for_admin_wildcard
- security_manager_15_privacy_manager_send_policy_update_for_self
- security_manager_18_user_cynara_policy
- security_manager_19_security_manager_cmd_install
- security_manager_20_security_manager_cmd_users

Change-Id: I68f09f70d2cbdcd22351bb444757918d56f078f8
Signed-off-by: Rafal Krypa <r.krypa@samsung.com>

diff --git a/src/security-manager-tests/security_manager_tests.cpp b/src/security-manager-tests/security_manager_tests.cpp
index 13d8dab..4868809 100644 (file)
--- a/src/security-manager-tests/security_manager_tests.cpp
+++ b/src/security-manager-tests/security_manager_tests.cpp
@@ -1743,7 +1743,6 @@ RUNNER_MULTIPROCESS_TEST(security_manager_14_privacy_manager_fetch_and_update_po
 
 RUNNER_MULTIPROCESS_TEST(security_manager_15_privacy_manager_send_policy_update_for_admin)
 {
-    RUNNER_IGNORED_MSG("temporarily disabled due to gumd timeouts");
     const char *const update_app_id = "security_manager_15_update_app_id";
     const char *const update_privilege = "http://tizen.org/privilege/led";
     const char *const check_start_bucket = "ADMIN";
@@ -1811,7 +1810,6 @@ RUNNER_MULTIPROCESS_TEST(security_manager_15_privacy_manager_send_policy_update_
 
 RUNNER_MULTIPROCESS_TEST(security_manager_15_privacy_manager_send_policy_update_for_admin_wildcard)
 {
-    RUNNER_IGNORED_MSG("temporarily disabled due to gumd timeouts");
     const char *const update_other_app_id = "security_manager_15_update_other_app_id";
     const char *const update_privilege = "http://tizen.org/privilege/led";
     const char *const check_start_bucket = "ADMIN";
@@ -1880,7 +1878,6 @@ RUNNER_MULTIPROCESS_TEST(security_manager_15_privacy_manager_send_policy_update_
 
 RUNNER_MULTIPROCESS_TEST(security_manager_15_privacy_manager_send_policy_update_for_self)
 {
-    RUNNER_IGNORED_MSG("temporarily disabled due to gumd timeouts");
     const char *const update_app_id = "security_manager_15_update_app_id";
     const char *const update_privilege = "http://tizen.org/privilege/led";
     const char *const check_start_bucket = "";
@@ -2226,9 +2223,8 @@ RUNNER_MULTIPROCESS_TEST(security_manager_17_privacy_manager_fetch_whole_policy_
     }
 }
 
-RUNNER_CHILD_TEST(security_manager_18_user_cynara_policy)
+RUNNER_TEST(security_manager_18_user_cynara_policy)
 {
-    RUNNER_IGNORED_MSG("temporarily disabled due to gumd timeouts");
     const char *const MAIN_BUCKET = "MAIN";
     const char *const MANIFESTS_BUCKET = "MANIFESTS";
     const char *const ADMIN_BUCKET = "ADMIN";
@@ -2236,7 +2232,7 @@ RUNNER_CHILD_TEST(security_manager_18_user_cynara_policy)
     const std::string username("sm_test_10_user_cynara_policy");
     CynaraTestAdmin::Admin admin;
     std::string uid_string;
-    TemporaryTestUser user(username, GUM_USERTYPE_NORMAL, true);
+    TemporaryTestUser user(username, GUM_USERTYPE_NORMAL, false);
     user.create();
     user.getUidString(uid_string);
 
@@ -2253,9 +2249,8 @@ RUNNER_CHILD_TEST(security_manager_18_user_cynara_policy)
     admin.listPolicies(ADMIN_BUCKET, CYNARA_ADMIN_WILDCARD, uid_string.c_str(), CYNARA_ADMIN_WILDCARD, emptyContainer, CYNARA_API_SUCCESS);
 }
 
-RUNNER_CHILD_TEST(security_manager_19_security_manager_cmd_install)
+RUNNER_TEST(security_manager_19_security_manager_cmd_install)
 {
-    RUNNER_IGNORED_MSG("temporarily disabled due to gumd timeouts");
     int ret;
     const int SUCCESS = 0;
     const int FAILURE = 256;
@@ -2263,7 +2258,7 @@ RUNNER_CHILD_TEST(security_manager_19_security_manager_cmd_install)
     const std::string pkg_id = "security_manager_10_pkg";
     const std::string username("sm_test_10_user_name");
     std::string uid_string;
-    TemporaryTestUser user(username, GUM_USERTYPE_NORMAL, true);
+    TemporaryTestUser user(username, GUM_USERTYPE_NORMAL, false);
     user.create();
     user.getUidString(uid_string);
     const std::string path1 = appDirPath(user, app_id, pkg_id) + "/p1";
@@ -2298,22 +2293,21 @@ RUNNER_CHILD_TEST(security_manager_19_security_manager_cmd_install)
     };
 
     for (auto &op : operations) {
-        ret = system(op.command.c_str());
+        ret = system((op.command + " 1>/dev/null 2>&1").c_str());
         RUNNER_ASSERT_MSG(ret == op.expected_result,
                 "Unexpected result for command '" << op.command <<"': "
                 << ret << " Expected was: "<< op.expected_result);
     }
 }
 
-RUNNER_CHILD_TEST(security_manager_20_security_manager_cmd_users)
+RUNNER_TEST(security_manager_20_security_manager_cmd_users)
 {
-    RUNNER_IGNORED_MSG("temporarily disabled due to gumd timeouts");
     int ret;
     const int SUCCESS = 0;
     const int FAILURE = 256;
     const std::string username("sm_test_11_user_name");
     std::string uid_string;
-    TemporaryTestUser user(username, GUM_USERTYPE_NORMAL, true);
+    TemporaryTestUser user(username, GUM_USERTYPE_NORMAL, false);
     user.create();
     user.getUidString(uid_string);
     const std::string uidopt = " --uid=" + uid_string;
@@ -2337,7 +2331,7 @@ RUNNER_CHILD_TEST(security_manager_20_security_manager_cmd_users)
     };
 
     for (auto &op : operations) {
-        ret = system(op.command.c_str());
+        ret = system((op.command + " 1>/dev/null 2>&1").c_str());
         RUNNER_ASSERT_MSG(ret == op.expected_result,
                 "Unexpected result for command '" << op.command <<"': "
                 << ret << " Expected was: "<< op.expected_result);
@@ -2377,8 +2371,8 @@ RUNNER_MULTIPROCESS_TEST(security_manager_21_security_manager_admin_deny_user_pr
     if (pid != 0)//parent process
     {
         std::string childuidstr;
-        TemporaryTestUser admin("sm_test_13_ADMIN_USER", GUM_USERTYPE_ADMIN, true);
-        TemporaryTestUser child("sm_test_13_NORMAL_USER", GUM_USERTYPE_NORMAL, true);
+        TemporaryTestUser admin("sm_test_13_ADMIN_USER", GUM_USERTYPE_ADMIN, false);
+        TemporaryTestUser child("sm_test_13_NORMAL_USER", GUM_USERTYPE_NORMAL, false);
 
         InstallRequest request,request2;
         FdUniquePtr pipeptr(pipefd+1);