CKM: Adopt test to work without mockups

Newest version of key-manager was integrated with
security-manager and cynara definitely and it's not
possible to compile it with mockups.

Change-Id: I4f5646f5215597d39d70eb08c0320ed8ac31d31b

diff --git a/src/ckm/ckm-common.cpp b/src/ckm/ckm-common.cpp
index a34b0d57420e8fba25bcaa29e6bfeac21534a981..914757c7364475329753dc78993ab2fac4a421c5 100644 (file)
--- a/src/ckm/ckm-common.cpp
+++ b/src/ckm/ckm-common.cpp
@@ -31,7 +31,7 @@
 #include <fcntl.h>
 #include <unistd.h>
 
-const std::string SMACK_USER_APP_PREFIX = "User::App::";
+const std::string SMACK_USER_APP_PREFIX = "User::Pkg::";
 const char *SYSTEM_LABEL = ckmc_owner_id_system;
 const char *TEST_LABEL = "test_label";
 const char *TEST_LABEL_2 = "test_label_2";

diff --git a/src/ckm/privileged/ckm-tests-on-onlycap.sh b/src/ckm/privileged/ckm-tests-on-onlycap.sh
index cc0b7ea53bc6d123059491674b75d7810063b226..32692568ab8841ece70a01f098b2ec4a5e138cc2 100644 (file)
--- a/src/ckm/privileged/ckm-tests-on-onlycap.sh
+++ b/src/ckm/privileged/ckm-tests-on-onlycap.sh
@@ -21,11 +21,11 @@
 
 # push test app lables to onlycap label list
 echo "System::Privileged \
-      User::App::test_label \
-      User::App::test_label_2 \
-      User::App::test_label_3 \
-      User::App::test_label_4 \
-      User::App::test_label_5 \
+      User::Pkg::test_label \
+      User::Pkg::test_label_2 \
+      User::Pkg::test_label_3 \
+      User::Pkg::test_label_4 \
+      User::Pkg::test_label_5 \
       System" > /sys/fs/smackfs/onlycap
 
 # set capability for changing smack label of self and add/remove smack rules

diff --git a/src/ckm/privileged/initial-values.cpp b/src/ckm/privileged/initial-values.cpp
index be17a4a242682be84e8016f3d890fdb61339ebc5..34638fcb167419675599fa7afeb3fbd2fe424c45 100644 (file)
--- a/src/ckm/privileged/initial-values.cpp
+++ b/src/ckm/privileged/initial-values.cpp
@@ -146,8 +146,6 @@ RUNNER_TEST(T6010_PARSE_XML_FILE_AT_STARTUP)
 
     // [test1]
     {
-        ScopedAccessProvider ap(SYSTEM_LABEL);
-        ap.applyAndSwithToUser(0, 0);
         check_key(XML_1_EXPECTED_KEY_1_RSA.c_str(), CKMC_ERROR_NOT_EXPORTABLE);
         check_key_allowed(XML_1_EXPECTED_KEY_2_RSA.c_str(), CKMC_KEY_RSA_PRIVATE);
         check_key_allowed(XML_1_EXPECTED_KEY_3_AES.c_str(), CKMC_KEY_AES);