From 85811cad9ffe5c060167777361226f17ec413c08 Mon Sep 17 00:00:00 2001 From: Marcin Niesluchowski Date: Thu, 22 May 2014 14:18:21 +0200 Subject: [PATCH] Revert "Fix security-server server tests" This reverts commit df5967df7e0c2d61ca4829c3add727a1696cd058. Conflicts: tests/security-server-tests/server.cpp Change-Id: I10296aab70f267f90e7a94432672fd0b94b9b129 --- tests/security-server-tests/cookie_api.cpp | 4 ---- tests/security-server-tests/server.cpp | 3 --- 2 files changed, 7 deletions(-) diff --git a/tests/security-server-tests/cookie_api.cpp b/tests/security-server-tests/cookie_api.cpp index 6530292..993c9bf 100644 --- a/tests/security-server-tests/cookie_api.cpp +++ b/tests/security-server-tests/cookie_api.cpp @@ -282,7 +282,6 @@ RUNNER_CHILD_TEST(tc_unit_03_01_security_server_check_privilege) //privileges drop and no smack rule RUNNER_CHILD_TEST_SMACK(tc_unit_03_02_app_user_security_server_check_privilege) { - RUNNER_IGNORED_MSG("Security-server sockets are not labeled."); Cookie cookie = getCookieFromSS(); SecurityServer::AccessProvider provider("selflabel_03_02"); @@ -366,7 +365,6 @@ RUNNER_CHILD_TEST(tc_unit_05_01_security_server_get_cookie_pid) //privileges drop and no smack rule RUNNER_CHILD_TEST_SMACK(tc_unit_05_02_app_user_security_server_get_cookie_pid) { - RUNNER_IGNORED_MSG("Security-server sockets are not labeled."); Cookie cookie = getCookieFromSS(); SecurityServer::AccessProvider provider("selflabel_05_02"); @@ -426,7 +424,6 @@ RUNNER_CHILD_TEST_NOSMACK(tc_unit_06_01_security_server_get_smacklabel_cookie_no //privileges drop and no smack rule RUNNER_CHILD_TEST_SMACK(tc_unit_06_02_app_user_security_server_get_smacklabel_cookie) { - RUNNER_IGNORED_MSG("Security-server sockets are not labeled."); Cookie cookie = getCookieFromSS(); SecurityServer::AccessProvider provider("selflabel_06_02"); @@ -490,7 +487,6 @@ RUNNER_CHILD_TEST_SMACK(tc_unit_09_01_app_user_cookie_API_access_allow) // disable access and drop privileges RUNNER_CHILD_TEST_SMACK(tc_unit_09_02_app_user_cookie_API_access_deny) { - RUNNER_IGNORED_MSG("Security-server sockets are not labeled."); SecurityServer::AccessProvider provider("subject_1d414140"); provider.applyAndSwithToUser(APP_UID, APP_GID); diff --git a/tests/security-server-tests/server.cpp b/tests/security-server-tests/server.cpp index 56034e9..7c90047 100644 --- a/tests/security-server-tests/server.cpp +++ b/tests/security-server-tests/server.cpp @@ -162,7 +162,6 @@ RUNNER_CHILD_TEST_SMACK(tc01a_security_server_app_give_access) RUNNER_CHILD_TEST_SMACK(tc01c_security_server_app_give_access_no_access) { - RUNNER_IGNORED_MSG("Security-server sockets are not labeled."); const char *subject = "xxx45v34sfa"; const char *object = "yyy78x2lkjz"; @@ -236,7 +235,6 @@ RUNNER_CHILD_TEST_SMACK(tc03_check_API_passwd_allow) RUNNER_CHILD_TEST_SMACK(tc04_check_API_passwd_denied) { - RUNNER_IGNORED_MSG("Security-server sockets are not labeled."); check_API_passwd(true); } @@ -257,7 +255,6 @@ RUNNER_CHILD_TEST_SMACK(tc07_check_API_data_share_allow) RUNNER_CHILD_TEST_SMACK(tc08_check_API_data_share_denied) { - RUNNER_IGNORED_MSG("Security-server sockets are not labeled."); SecurityServer::AccessProvider provider(TEST08_SUBJECT); provider.applyAndSwithToUser(APP_UID, APP_GID); -- 2.7.4