From 5e7d7dfbb1a9f7bde6bcea1f35e9e8b85d17045d Mon Sep 17 00:00:00 2001 From: Zbigniew Jasinski Date: Fri, 6 Feb 2015 17:36:37 +0100 Subject: [PATCH] Tests for new structure of application file paths Change-Id: I47ffaa1524a7044904413d878573ef4b4e9cea89 --- packaging/security-tests.spec | 4 ++-- tests/security-manager-tests/CMakeLists.txt | 2 +- .../app_dir/.level_1/.level_2}/exec | 0 .../app_dir/.level_1/.level_2}/normal | 0 .../level_1 => apps_rw/app_dir/.level_1}/exec | 0 .../app_dir/.level_1/level_2}/exec | 0 .../app_dir/.level_1/level_2}/normal | 0 .../app_dir/.level_1/link_to_non_app_exec | 0 .../app_dir/.level_1/link_to_non_app_normal | 0 .../level_2 => apps_rw/app_dir/.level_1}/normal | 0 .../{test_DIR/non_app_dir => apps_rw/app_dir}/exec | 0 .../app_dir/level_1/.level_2}/exec | 0 .../app_dir}/level_1/.level_2/normal | 0 .../.level_1 => apps_rw/app_dir/level_1}/exec | 0 .../app_dir/level_1/level_2}/exec | 0 .../app_dir/level_1/level_2}/link_to_exec | 0 .../app_dir/level_1/level_2}/link_to_non_exec | 0 .../app_dir/level_1/level_2}/normal | 0 .../app_dir}/level_1/link_to_exec | 0 .../app_dir}/level_1/link_to_non_exec | 0 .../level_2 => apps_rw/app_dir/level_1}/normal | 0 .../level_2 => apps_rw/app_dir}/link_to_exec | 0 .../app_dir}/link_to_non_app_dir | 0 .../app_dir}/link_to_non_app_exec | 0 .../app_dir}/link_to_non_app_normal | 0 .../level_2 => apps_rw/app_dir}/link_to_non_exec | 0 .../.level_1/.level_2 => apps_rw/app_dir}/normal | 0 .../app_dir_public_ro/.level_1/.level_2}/exec | 0 .../app_dir_public_ro/.level_1/.level_2}/normal | 0 .../app_dir_public_ro/.level_1}/exec | 0 .../app_dir_public_ro/.level_1/level_2}/exec | 0 .../app_dir_public_ro/.level_1/level_2}/normal | 0 .../app_dir_public_ro/.level_1}/normal | 0 .../{test_DIR => apps_rw}/app_dir_public_ro/exec | 0 .../app_dir_public_ro/level_1/.level_2}/exec | 0 .../app_dir_public_ro/level_1/.level_2/normal | 0 .../app_dir_public_ro/level_1}/exec | 0 .../app_dir_public_ro/level_1/level_2}/exec | 0 .../level_1/level_2}/link_to_exec | 0 .../level_1/level_2}/link_to_non_exec | 0 .../app_dir_public_ro/level_1/level_2}/normal | 0 .../app_dir_public_ro/level_1/link_to_exec | 0 .../app_dir_public_ro/level_1/link_to_non_exec | 0 .../app_dir_public_ro/level_1}/normal | 0 .../app_dir_public_ro}/link_to_exec | 0 .../app_dir_public_ro}/link_to_non_app_dir | 0 .../app_dir_public_ro}/link_to_non_app_exec | 0 .../app_dir_public_ro}/link_to_non_app_normal | 0 .../app_dir_public_ro}/link_to_non_exec | 0 .../.level_2 => apps_rw/app_dir_public_ro}/normal | 0 .../non_app_dir/.level_1/.level_2}/exec | 0 .../non_app_dir/.level_1/.level_2}/normal | 0 .../level_1 => apps_rw/non_app_dir/.level_1}/exec | 0 .../non_app_dir/.level_1/level_2}/exec | 0 .../non_app_dir/.level_1/level_2}/normal | 0 .../non_app_dir/.level_1}/normal | 0 .../{test_DIR/app_dir => apps_rw/non_app_dir}/exec | 0 .../non_app_dir/level_1/.level_2}/exec | 0 .../non_app_dir}/level_1/.level_2/normal | 0 .../.level_1 => apps_rw/non_app_dir/level_1}/exec | 0 .../non_app_dir/level_1/level_2}/exec | 0 .../non_app_dir/level_1/level_2}/link_to_exec | 0 .../non_app_dir/level_1/level_2}/link_to_non_exec | 0 .../non_app_dir/level_1/level_2}/normal | 0 .../non_app_dir}/level_1/link_to_exec | 0 .../non_app_dir}/level_1/link_to_non_exec | 0 .../level_2 => apps_rw/non_app_dir/level_1}/normal | 0 .../level_2 => apps_rw/non_app_dir}/link_to_exec | 0 .../non_app_dir}/link_to_non_exec | 0 .../.level_2 => apps_rw/non_app_dir}/normal | 0 tests/security-manager-tests/apps_rw/subdir/file | 0 .../security_manager_tests.cpp | 28 +++++++++++++++------- 72 files changed, 22 insertions(+), 12 deletions(-) rename tests/security-manager-tests/{test_DIR/non_app_dir/level_1/level_2 => apps_rw/app_dir/.level_1/.level_2}/exec (100%) rename tests/security-manager-tests/{test_DIR/non_app_dir => apps_rw/app_dir/.level_1/.level_2}/normal (100%) rename tests/security-manager-tests/{test_DIR/non_app_dir/level_1 => apps_rw/app_dir/.level_1}/exec (100%) rename tests/security-manager-tests/{test_DIR/non_app_dir/level_1/.level_2 => apps_rw/app_dir/.level_1/level_2}/exec (100%) rename tests/security-manager-tests/{test_DIR/non_app_dir/level_1 => apps_rw/app_dir/.level_1/level_2}/normal (100%) rename tests/security-manager-tests/{test_DIR => apps_rw}/app_dir/.level_1/link_to_non_app_exec (100%) rename tests/security-manager-tests/{test_DIR => apps_rw}/app_dir/.level_1/link_to_non_app_normal (100%) rename tests/security-manager-tests/{test_DIR/non_app_dir/level_1/level_2 => apps_rw/app_dir/.level_1}/normal (100%) rename tests/security-manager-tests/{test_DIR/non_app_dir => apps_rw/app_dir}/exec (100%) rename tests/security-manager-tests/{test_DIR/non_app_dir/.level_1/level_2 => apps_rw/app_dir/level_1/.level_2}/exec (100%) rename tests/security-manager-tests/{test_DIR/non_app_dir => apps_rw/app_dir}/level_1/.level_2/normal (100%) rename tests/security-manager-tests/{test_DIR/non_app_dir/.level_1 => apps_rw/app_dir/level_1}/exec (100%) rename tests/security-manager-tests/{test_DIR/non_app_dir/.level_1/.level_2 => apps_rw/app_dir/level_1/level_2}/exec (100%) rename tests/security-manager-tests/{test_DIR/non_app_dir => apps_rw/app_dir/level_1/level_2}/link_to_exec (100%) rename tests/security-manager-tests/{test_DIR/non_app_dir => apps_rw/app_dir/level_1/level_2}/link_to_non_exec (100%) rename tests/security-manager-tests/{test_DIR/non_app_dir/.level_1 => apps_rw/app_dir/level_1/level_2}/normal (100%) rename tests/security-manager-tests/{test_DIR/non_app_dir => apps_rw/app_dir}/level_1/link_to_exec (100%) rename tests/security-manager-tests/{test_DIR/non_app_dir => apps_rw/app_dir}/level_1/link_to_non_exec (100%) rename tests/security-manager-tests/{test_DIR/non_app_dir/.level_1/level_2 => apps_rw/app_dir/level_1}/normal (100%) rename tests/security-manager-tests/{test_DIR/non_app_dir/level_1/level_2 => apps_rw/app_dir}/link_to_exec (100%) rename tests/security-manager-tests/{test_DIR/app_dir_public_ro => apps_rw/app_dir}/link_to_non_app_dir (100%) rename tests/security-manager-tests/{test_DIR/app_dir_public_ro => apps_rw/app_dir}/link_to_non_app_exec (100%) rename tests/security-manager-tests/{test_DIR/app_dir_public_ro => apps_rw/app_dir}/link_to_non_app_normal (100%) rename tests/security-manager-tests/{test_DIR/non_app_dir/level_1/level_2 => apps_rw/app_dir}/link_to_non_exec (100%) rename tests/security-manager-tests/{test_DIR/non_app_dir/.level_1/.level_2 => apps_rw/app_dir}/normal (100%) rename tests/security-manager-tests/{test_DIR/app_dir_public_ro/level_1/level_2 => apps_rw/app_dir_public_ro/.level_1/.level_2}/exec (100%) rename tests/security-manager-tests/{test_DIR/app_dir_public_ro => apps_rw/app_dir_public_ro/.level_1/.level_2}/normal (100%) rename tests/security-manager-tests/{test_DIR/app_dir_public_ro/level_1 => apps_rw/app_dir_public_ro/.level_1}/exec (100%) rename tests/security-manager-tests/{test_DIR/app_dir_public_ro/level_1/.level_2 => apps_rw/app_dir_public_ro/.level_1/level_2}/exec (100%) rename tests/security-manager-tests/{test_DIR/app_dir_public_ro/level_1 => apps_rw/app_dir_public_ro/.level_1/level_2}/normal (100%) rename tests/security-manager-tests/{test_DIR/app_dir_public_ro/level_1/level_2 => apps_rw/app_dir_public_ro/.level_1}/normal (100%) rename tests/security-manager-tests/{test_DIR => apps_rw}/app_dir_public_ro/exec (100%) rename tests/security-manager-tests/{test_DIR/app_dir_public_ro/.level_1/level_2 => apps_rw/app_dir_public_ro/level_1/.level_2}/exec (100%) rename tests/security-manager-tests/{test_DIR => apps_rw}/app_dir_public_ro/level_1/.level_2/normal (100%) rename tests/security-manager-tests/{test_DIR/app_dir_public_ro/.level_1 => apps_rw/app_dir_public_ro/level_1}/exec (100%) rename tests/security-manager-tests/{test_DIR/app_dir_public_ro/.level_1/.level_2 => apps_rw/app_dir_public_ro/level_1/level_2}/exec (100%) rename tests/security-manager-tests/{test_DIR/app_dir_public_ro => apps_rw/app_dir_public_ro/level_1/level_2}/link_to_exec (100%) rename tests/security-manager-tests/{test_DIR/app_dir_public_ro => apps_rw/app_dir_public_ro/level_1/level_2}/link_to_non_exec (100%) rename tests/security-manager-tests/{test_DIR/app_dir_public_ro/.level_1 => apps_rw/app_dir_public_ro/level_1/level_2}/normal (100%) rename tests/security-manager-tests/{test_DIR => apps_rw}/app_dir_public_ro/level_1/link_to_exec (100%) rename tests/security-manager-tests/{test_DIR => apps_rw}/app_dir_public_ro/level_1/link_to_non_exec (100%) rename tests/security-manager-tests/{test_DIR/app_dir_public_ro/.level_1/level_2 => apps_rw/app_dir_public_ro/level_1}/normal (100%) rename tests/security-manager-tests/{test_DIR/app_dir_public_ro/level_1/level_2 => apps_rw/app_dir_public_ro}/link_to_exec (100%) rename tests/security-manager-tests/{test_DIR/app_dir => apps_rw/app_dir_public_ro}/link_to_non_app_dir (100%) rename tests/security-manager-tests/{test_DIR/app_dir => apps_rw/app_dir_public_ro}/link_to_non_app_exec (100%) rename tests/security-manager-tests/{test_DIR/app_dir => apps_rw/app_dir_public_ro}/link_to_non_app_normal (100%) rename tests/security-manager-tests/{test_DIR/app_dir_public_ro/level_1/level_2 => apps_rw/app_dir_public_ro}/link_to_non_exec (100%) rename tests/security-manager-tests/{test_DIR/app_dir_public_ro/.level_1/.level_2 => apps_rw/app_dir_public_ro}/normal (100%) rename tests/security-manager-tests/{test_DIR/app_dir/level_1/level_2 => apps_rw/non_app_dir/.level_1/.level_2}/exec (100%) rename tests/security-manager-tests/{test_DIR/app_dir => apps_rw/non_app_dir/.level_1/.level_2}/normal (100%) rename tests/security-manager-tests/{test_DIR/app_dir/level_1 => apps_rw/non_app_dir/.level_1}/exec (100%) rename tests/security-manager-tests/{test_DIR/app_dir/level_1/.level_2 => apps_rw/non_app_dir/.level_1/level_2}/exec (100%) rename tests/security-manager-tests/{test_DIR/app_dir/level_1 => apps_rw/non_app_dir/.level_1/level_2}/normal (100%) rename tests/security-manager-tests/{test_DIR/app_dir/level_1/level_2 => apps_rw/non_app_dir/.level_1}/normal (100%) rename tests/security-manager-tests/{test_DIR/app_dir => apps_rw/non_app_dir}/exec (100%) rename tests/security-manager-tests/{test_DIR/app_dir/.level_1/level_2 => apps_rw/non_app_dir/level_1/.level_2}/exec (100%) rename tests/security-manager-tests/{test_DIR/app_dir => apps_rw/non_app_dir}/level_1/.level_2/normal (100%) rename tests/security-manager-tests/{test_DIR/app_dir/.level_1 => apps_rw/non_app_dir/level_1}/exec (100%) rename tests/security-manager-tests/{test_DIR/app_dir/.level_1/.level_2 => apps_rw/non_app_dir/level_1/level_2}/exec (100%) rename tests/security-manager-tests/{test_DIR/app_dir => apps_rw/non_app_dir/level_1/level_2}/link_to_exec (100%) rename tests/security-manager-tests/{test_DIR/app_dir => apps_rw/non_app_dir/level_1/level_2}/link_to_non_exec (100%) rename tests/security-manager-tests/{test_DIR/app_dir/.level_1 => apps_rw/non_app_dir/level_1/level_2}/normal (100%) rename tests/security-manager-tests/{test_DIR/app_dir => apps_rw/non_app_dir}/level_1/link_to_exec (100%) rename tests/security-manager-tests/{test_DIR/app_dir => apps_rw/non_app_dir}/level_1/link_to_non_exec (100%) rename tests/security-manager-tests/{test_DIR/app_dir/.level_1/level_2 => apps_rw/non_app_dir/level_1}/normal (100%) rename tests/security-manager-tests/{test_DIR/app_dir/level_1/level_2 => apps_rw/non_app_dir}/link_to_exec (100%) rename tests/security-manager-tests/{test_DIR/app_dir/level_1/level_2 => apps_rw/non_app_dir}/link_to_non_exec (100%) rename tests/security-manager-tests/{test_DIR/app_dir/.level_1/.level_2 => apps_rw/non_app_dir}/normal (100%) create mode 100644 tests/security-manager-tests/apps_rw/subdir/file diff --git a/packaging/security-tests.spec b/packaging/security-tests.spec index b663366..4a1d30d 100644 --- a/packaging/security-tests.spec +++ b/packaging/security-tests.spec @@ -53,7 +53,7 @@ ln -sf /etc/smack/test_smack_rules %{buildroot}/etc/smack/test_smack_rules_lnk %post find /etc/smack/test_privilege_control_DIR/ -type f -name exec -exec chmod 0755 {} + -find /usr/apps/test_DIR/ -type f -name exec -exec chmod 0755 {} + +find /usr/apps/ -type f -name exec -exec chmod 0755 {} + # Load permissions templates api_feature_loader --verbose @@ -88,7 +88,7 @@ echo "security-tests postinst done ..." /etc/smack/test_smack_rules_lnk /usr/share/privilege-control/* /etc/smack/test_privilege_control_DIR/* -/usr/apps/test_DIR/* +/usr/apps/* /usr/bin/test-app-efl /usr/bin/test-app-osp /usr/bin/test-app-wgt diff --git a/tests/security-manager-tests/CMakeLists.txt b/tests/security-manager-tests/CMakeLists.txt index 447efce..5b2b2eb 100644 --- a/tests/security-manager-tests/CMakeLists.txt +++ b/tests/security-manager-tests/CMakeLists.txt @@ -81,6 +81,6 @@ TARGET_LINK_LIBRARIES(${TARGET_SEC_MGR_TESTS} INSTALL(TARGETS ${TARGET_SEC_MGR_TESTS} DESTINATION /usr/bin) INSTALL(DIRECTORY - ${PROJECT_SOURCE_DIR}/tests/security-manager-tests/test_DIR + ${PROJECT_SOURCE_DIR}/tests/security-manager-tests/apps_rw/ DESTINATION /usr/apps/ ) diff --git a/tests/security-manager-tests/test_DIR/non_app_dir/level_1/level_2/exec b/tests/security-manager-tests/apps_rw/app_dir/.level_1/.level_2/exec similarity index 100% rename from tests/security-manager-tests/test_DIR/non_app_dir/level_1/level_2/exec rename to tests/security-manager-tests/apps_rw/app_dir/.level_1/.level_2/exec diff --git a/tests/security-manager-tests/test_DIR/non_app_dir/normal b/tests/security-manager-tests/apps_rw/app_dir/.level_1/.level_2/normal similarity index 100% rename from tests/security-manager-tests/test_DIR/non_app_dir/normal rename to tests/security-manager-tests/apps_rw/app_dir/.level_1/.level_2/normal diff --git a/tests/security-manager-tests/test_DIR/non_app_dir/level_1/exec b/tests/security-manager-tests/apps_rw/app_dir/.level_1/exec similarity index 100% rename from tests/security-manager-tests/test_DIR/non_app_dir/level_1/exec rename to tests/security-manager-tests/apps_rw/app_dir/.level_1/exec diff --git a/tests/security-manager-tests/test_DIR/non_app_dir/level_1/.level_2/exec b/tests/security-manager-tests/apps_rw/app_dir/.level_1/level_2/exec similarity index 100% rename from tests/security-manager-tests/test_DIR/non_app_dir/level_1/.level_2/exec rename to tests/security-manager-tests/apps_rw/app_dir/.level_1/level_2/exec diff --git a/tests/security-manager-tests/test_DIR/non_app_dir/level_1/normal b/tests/security-manager-tests/apps_rw/app_dir/.level_1/level_2/normal similarity index 100% rename from tests/security-manager-tests/test_DIR/non_app_dir/level_1/normal rename to tests/security-manager-tests/apps_rw/app_dir/.level_1/level_2/normal diff --git a/tests/security-manager-tests/test_DIR/app_dir/.level_1/link_to_non_app_exec b/tests/security-manager-tests/apps_rw/app_dir/.level_1/link_to_non_app_exec similarity index 100% rename from tests/security-manager-tests/test_DIR/app_dir/.level_1/link_to_non_app_exec rename to tests/security-manager-tests/apps_rw/app_dir/.level_1/link_to_non_app_exec diff --git a/tests/security-manager-tests/test_DIR/app_dir/.level_1/link_to_non_app_normal b/tests/security-manager-tests/apps_rw/app_dir/.level_1/link_to_non_app_normal similarity index 100% rename from tests/security-manager-tests/test_DIR/app_dir/.level_1/link_to_non_app_normal rename to tests/security-manager-tests/apps_rw/app_dir/.level_1/link_to_non_app_normal diff --git a/tests/security-manager-tests/test_DIR/non_app_dir/level_1/level_2/normal b/tests/security-manager-tests/apps_rw/app_dir/.level_1/normal similarity index 100% rename from tests/security-manager-tests/test_DIR/non_app_dir/level_1/level_2/normal rename to tests/security-manager-tests/apps_rw/app_dir/.level_1/normal diff --git a/tests/security-manager-tests/test_DIR/non_app_dir/exec b/tests/security-manager-tests/apps_rw/app_dir/exec similarity index 100% rename from tests/security-manager-tests/test_DIR/non_app_dir/exec rename to tests/security-manager-tests/apps_rw/app_dir/exec diff --git a/tests/security-manager-tests/test_DIR/non_app_dir/.level_1/level_2/exec b/tests/security-manager-tests/apps_rw/app_dir/level_1/.level_2/exec similarity index 100% rename from tests/security-manager-tests/test_DIR/non_app_dir/.level_1/level_2/exec rename to tests/security-manager-tests/apps_rw/app_dir/level_1/.level_2/exec diff --git a/tests/security-manager-tests/test_DIR/non_app_dir/level_1/.level_2/normal b/tests/security-manager-tests/apps_rw/app_dir/level_1/.level_2/normal similarity index 100% rename from tests/security-manager-tests/test_DIR/non_app_dir/level_1/.level_2/normal rename to tests/security-manager-tests/apps_rw/app_dir/level_1/.level_2/normal diff --git a/tests/security-manager-tests/test_DIR/non_app_dir/.level_1/exec b/tests/security-manager-tests/apps_rw/app_dir/level_1/exec similarity index 100% rename from tests/security-manager-tests/test_DIR/non_app_dir/.level_1/exec rename to tests/security-manager-tests/apps_rw/app_dir/level_1/exec diff --git a/tests/security-manager-tests/test_DIR/non_app_dir/.level_1/.level_2/exec b/tests/security-manager-tests/apps_rw/app_dir/level_1/level_2/exec similarity index 100% rename from tests/security-manager-tests/test_DIR/non_app_dir/.level_1/.level_2/exec rename to tests/security-manager-tests/apps_rw/app_dir/level_1/level_2/exec diff --git a/tests/security-manager-tests/test_DIR/non_app_dir/link_to_exec b/tests/security-manager-tests/apps_rw/app_dir/level_1/level_2/link_to_exec similarity index 100% rename from tests/security-manager-tests/test_DIR/non_app_dir/link_to_exec rename to tests/security-manager-tests/apps_rw/app_dir/level_1/level_2/link_to_exec diff --git a/tests/security-manager-tests/test_DIR/non_app_dir/link_to_non_exec b/tests/security-manager-tests/apps_rw/app_dir/level_1/level_2/link_to_non_exec similarity index 100% rename from tests/security-manager-tests/test_DIR/non_app_dir/link_to_non_exec rename to tests/security-manager-tests/apps_rw/app_dir/level_1/level_2/link_to_non_exec diff --git a/tests/security-manager-tests/test_DIR/non_app_dir/.level_1/normal b/tests/security-manager-tests/apps_rw/app_dir/level_1/level_2/normal similarity index 100% rename from tests/security-manager-tests/test_DIR/non_app_dir/.level_1/normal rename to tests/security-manager-tests/apps_rw/app_dir/level_1/level_2/normal diff --git a/tests/security-manager-tests/test_DIR/non_app_dir/level_1/link_to_exec b/tests/security-manager-tests/apps_rw/app_dir/level_1/link_to_exec similarity index 100% rename from tests/security-manager-tests/test_DIR/non_app_dir/level_1/link_to_exec rename to tests/security-manager-tests/apps_rw/app_dir/level_1/link_to_exec diff --git a/tests/security-manager-tests/test_DIR/non_app_dir/level_1/link_to_non_exec b/tests/security-manager-tests/apps_rw/app_dir/level_1/link_to_non_exec similarity index 100% rename from tests/security-manager-tests/test_DIR/non_app_dir/level_1/link_to_non_exec rename to tests/security-manager-tests/apps_rw/app_dir/level_1/link_to_non_exec diff --git a/tests/security-manager-tests/test_DIR/non_app_dir/.level_1/level_2/normal b/tests/security-manager-tests/apps_rw/app_dir/level_1/normal similarity index 100% rename from tests/security-manager-tests/test_DIR/non_app_dir/.level_1/level_2/normal rename to tests/security-manager-tests/apps_rw/app_dir/level_1/normal diff --git a/tests/security-manager-tests/test_DIR/non_app_dir/level_1/level_2/link_to_exec b/tests/security-manager-tests/apps_rw/app_dir/link_to_exec similarity index 100% rename from tests/security-manager-tests/test_DIR/non_app_dir/level_1/level_2/link_to_exec rename to tests/security-manager-tests/apps_rw/app_dir/link_to_exec diff --git a/tests/security-manager-tests/test_DIR/app_dir_public_ro/link_to_non_app_dir b/tests/security-manager-tests/apps_rw/app_dir/link_to_non_app_dir similarity index 100% rename from tests/security-manager-tests/test_DIR/app_dir_public_ro/link_to_non_app_dir rename to tests/security-manager-tests/apps_rw/app_dir/link_to_non_app_dir diff --git a/tests/security-manager-tests/test_DIR/app_dir_public_ro/link_to_non_app_exec b/tests/security-manager-tests/apps_rw/app_dir/link_to_non_app_exec similarity index 100% rename from tests/security-manager-tests/test_DIR/app_dir_public_ro/link_to_non_app_exec rename to tests/security-manager-tests/apps_rw/app_dir/link_to_non_app_exec diff --git a/tests/security-manager-tests/test_DIR/app_dir_public_ro/link_to_non_app_normal b/tests/security-manager-tests/apps_rw/app_dir/link_to_non_app_normal similarity index 100% rename from tests/security-manager-tests/test_DIR/app_dir_public_ro/link_to_non_app_normal rename to tests/security-manager-tests/apps_rw/app_dir/link_to_non_app_normal diff --git a/tests/security-manager-tests/test_DIR/non_app_dir/level_1/level_2/link_to_non_exec b/tests/security-manager-tests/apps_rw/app_dir/link_to_non_exec similarity index 100% rename from tests/security-manager-tests/test_DIR/non_app_dir/level_1/level_2/link_to_non_exec rename to tests/security-manager-tests/apps_rw/app_dir/link_to_non_exec diff --git a/tests/security-manager-tests/test_DIR/non_app_dir/.level_1/.level_2/normal b/tests/security-manager-tests/apps_rw/app_dir/normal similarity index 100% rename from tests/security-manager-tests/test_DIR/non_app_dir/.level_1/.level_2/normal rename to tests/security-manager-tests/apps_rw/app_dir/normal diff --git a/tests/security-manager-tests/test_DIR/app_dir_public_ro/level_1/level_2/exec b/tests/security-manager-tests/apps_rw/app_dir_public_ro/.level_1/.level_2/exec similarity index 100% rename from tests/security-manager-tests/test_DIR/app_dir_public_ro/level_1/level_2/exec rename to tests/security-manager-tests/apps_rw/app_dir_public_ro/.level_1/.level_2/exec diff --git a/tests/security-manager-tests/test_DIR/app_dir_public_ro/normal b/tests/security-manager-tests/apps_rw/app_dir_public_ro/.level_1/.level_2/normal similarity index 100% rename from tests/security-manager-tests/test_DIR/app_dir_public_ro/normal rename to tests/security-manager-tests/apps_rw/app_dir_public_ro/.level_1/.level_2/normal diff --git a/tests/security-manager-tests/test_DIR/app_dir_public_ro/level_1/exec b/tests/security-manager-tests/apps_rw/app_dir_public_ro/.level_1/exec similarity index 100% rename from tests/security-manager-tests/test_DIR/app_dir_public_ro/level_1/exec rename to tests/security-manager-tests/apps_rw/app_dir_public_ro/.level_1/exec diff --git a/tests/security-manager-tests/test_DIR/app_dir_public_ro/level_1/.level_2/exec b/tests/security-manager-tests/apps_rw/app_dir_public_ro/.level_1/level_2/exec similarity index 100% rename from tests/security-manager-tests/test_DIR/app_dir_public_ro/level_1/.level_2/exec rename to tests/security-manager-tests/apps_rw/app_dir_public_ro/.level_1/level_2/exec diff --git a/tests/security-manager-tests/test_DIR/app_dir_public_ro/level_1/normal b/tests/security-manager-tests/apps_rw/app_dir_public_ro/.level_1/level_2/normal similarity index 100% rename from tests/security-manager-tests/test_DIR/app_dir_public_ro/level_1/normal rename to tests/security-manager-tests/apps_rw/app_dir_public_ro/.level_1/level_2/normal diff --git a/tests/security-manager-tests/test_DIR/app_dir_public_ro/level_1/level_2/normal b/tests/security-manager-tests/apps_rw/app_dir_public_ro/.level_1/normal similarity index 100% rename from tests/security-manager-tests/test_DIR/app_dir_public_ro/level_1/level_2/normal rename to tests/security-manager-tests/apps_rw/app_dir_public_ro/.level_1/normal diff --git a/tests/security-manager-tests/test_DIR/app_dir_public_ro/exec b/tests/security-manager-tests/apps_rw/app_dir_public_ro/exec similarity index 100% rename from tests/security-manager-tests/test_DIR/app_dir_public_ro/exec rename to tests/security-manager-tests/apps_rw/app_dir_public_ro/exec diff --git a/tests/security-manager-tests/test_DIR/app_dir_public_ro/.level_1/level_2/exec b/tests/security-manager-tests/apps_rw/app_dir_public_ro/level_1/.level_2/exec similarity index 100% rename from tests/security-manager-tests/test_DIR/app_dir_public_ro/.level_1/level_2/exec rename to tests/security-manager-tests/apps_rw/app_dir_public_ro/level_1/.level_2/exec diff --git a/tests/security-manager-tests/test_DIR/app_dir_public_ro/level_1/.level_2/normal b/tests/security-manager-tests/apps_rw/app_dir_public_ro/level_1/.level_2/normal similarity index 100% rename from tests/security-manager-tests/test_DIR/app_dir_public_ro/level_1/.level_2/normal rename to tests/security-manager-tests/apps_rw/app_dir_public_ro/level_1/.level_2/normal diff --git a/tests/security-manager-tests/test_DIR/app_dir_public_ro/.level_1/exec b/tests/security-manager-tests/apps_rw/app_dir_public_ro/level_1/exec similarity index 100% rename from tests/security-manager-tests/test_DIR/app_dir_public_ro/.level_1/exec rename to tests/security-manager-tests/apps_rw/app_dir_public_ro/level_1/exec diff --git a/tests/security-manager-tests/test_DIR/app_dir_public_ro/.level_1/.level_2/exec b/tests/security-manager-tests/apps_rw/app_dir_public_ro/level_1/level_2/exec similarity index 100% rename from tests/security-manager-tests/test_DIR/app_dir_public_ro/.level_1/.level_2/exec rename to tests/security-manager-tests/apps_rw/app_dir_public_ro/level_1/level_2/exec diff --git a/tests/security-manager-tests/test_DIR/app_dir_public_ro/link_to_exec b/tests/security-manager-tests/apps_rw/app_dir_public_ro/level_1/level_2/link_to_exec similarity index 100% rename from tests/security-manager-tests/test_DIR/app_dir_public_ro/link_to_exec rename to tests/security-manager-tests/apps_rw/app_dir_public_ro/level_1/level_2/link_to_exec diff --git a/tests/security-manager-tests/test_DIR/app_dir_public_ro/link_to_non_exec b/tests/security-manager-tests/apps_rw/app_dir_public_ro/level_1/level_2/link_to_non_exec similarity index 100% rename from tests/security-manager-tests/test_DIR/app_dir_public_ro/link_to_non_exec rename to tests/security-manager-tests/apps_rw/app_dir_public_ro/level_1/level_2/link_to_non_exec diff --git a/tests/security-manager-tests/test_DIR/app_dir_public_ro/.level_1/normal b/tests/security-manager-tests/apps_rw/app_dir_public_ro/level_1/level_2/normal similarity index 100% rename from tests/security-manager-tests/test_DIR/app_dir_public_ro/.level_1/normal rename to tests/security-manager-tests/apps_rw/app_dir_public_ro/level_1/level_2/normal diff --git a/tests/security-manager-tests/test_DIR/app_dir_public_ro/level_1/link_to_exec b/tests/security-manager-tests/apps_rw/app_dir_public_ro/level_1/link_to_exec similarity index 100% rename from tests/security-manager-tests/test_DIR/app_dir_public_ro/level_1/link_to_exec rename to tests/security-manager-tests/apps_rw/app_dir_public_ro/level_1/link_to_exec diff --git a/tests/security-manager-tests/test_DIR/app_dir_public_ro/level_1/link_to_non_exec b/tests/security-manager-tests/apps_rw/app_dir_public_ro/level_1/link_to_non_exec similarity index 100% rename from tests/security-manager-tests/test_DIR/app_dir_public_ro/level_1/link_to_non_exec rename to tests/security-manager-tests/apps_rw/app_dir_public_ro/level_1/link_to_non_exec diff --git a/tests/security-manager-tests/test_DIR/app_dir_public_ro/.level_1/level_2/normal b/tests/security-manager-tests/apps_rw/app_dir_public_ro/level_1/normal similarity index 100% rename from tests/security-manager-tests/test_DIR/app_dir_public_ro/.level_1/level_2/normal rename to tests/security-manager-tests/apps_rw/app_dir_public_ro/level_1/normal diff --git a/tests/security-manager-tests/test_DIR/app_dir_public_ro/level_1/level_2/link_to_exec b/tests/security-manager-tests/apps_rw/app_dir_public_ro/link_to_exec similarity index 100% rename from tests/security-manager-tests/test_DIR/app_dir_public_ro/level_1/level_2/link_to_exec rename to tests/security-manager-tests/apps_rw/app_dir_public_ro/link_to_exec diff --git a/tests/security-manager-tests/test_DIR/app_dir/link_to_non_app_dir b/tests/security-manager-tests/apps_rw/app_dir_public_ro/link_to_non_app_dir similarity index 100% rename from tests/security-manager-tests/test_DIR/app_dir/link_to_non_app_dir rename to tests/security-manager-tests/apps_rw/app_dir_public_ro/link_to_non_app_dir diff --git a/tests/security-manager-tests/test_DIR/app_dir/link_to_non_app_exec b/tests/security-manager-tests/apps_rw/app_dir_public_ro/link_to_non_app_exec similarity index 100% rename from tests/security-manager-tests/test_DIR/app_dir/link_to_non_app_exec rename to tests/security-manager-tests/apps_rw/app_dir_public_ro/link_to_non_app_exec diff --git a/tests/security-manager-tests/test_DIR/app_dir/link_to_non_app_normal b/tests/security-manager-tests/apps_rw/app_dir_public_ro/link_to_non_app_normal similarity index 100% rename from tests/security-manager-tests/test_DIR/app_dir/link_to_non_app_normal rename to tests/security-manager-tests/apps_rw/app_dir_public_ro/link_to_non_app_normal diff --git a/tests/security-manager-tests/test_DIR/app_dir_public_ro/level_1/level_2/link_to_non_exec b/tests/security-manager-tests/apps_rw/app_dir_public_ro/link_to_non_exec similarity index 100% rename from tests/security-manager-tests/test_DIR/app_dir_public_ro/level_1/level_2/link_to_non_exec rename to tests/security-manager-tests/apps_rw/app_dir_public_ro/link_to_non_exec diff --git a/tests/security-manager-tests/test_DIR/app_dir_public_ro/.level_1/.level_2/normal b/tests/security-manager-tests/apps_rw/app_dir_public_ro/normal similarity index 100% rename from tests/security-manager-tests/test_DIR/app_dir_public_ro/.level_1/.level_2/normal rename to tests/security-manager-tests/apps_rw/app_dir_public_ro/normal diff --git a/tests/security-manager-tests/test_DIR/app_dir/level_1/level_2/exec b/tests/security-manager-tests/apps_rw/non_app_dir/.level_1/.level_2/exec similarity index 100% rename from tests/security-manager-tests/test_DIR/app_dir/level_1/level_2/exec rename to tests/security-manager-tests/apps_rw/non_app_dir/.level_1/.level_2/exec diff --git a/tests/security-manager-tests/test_DIR/app_dir/normal b/tests/security-manager-tests/apps_rw/non_app_dir/.level_1/.level_2/normal similarity index 100% rename from tests/security-manager-tests/test_DIR/app_dir/normal rename to tests/security-manager-tests/apps_rw/non_app_dir/.level_1/.level_2/normal diff --git a/tests/security-manager-tests/test_DIR/app_dir/level_1/exec b/tests/security-manager-tests/apps_rw/non_app_dir/.level_1/exec similarity index 100% rename from tests/security-manager-tests/test_DIR/app_dir/level_1/exec rename to tests/security-manager-tests/apps_rw/non_app_dir/.level_1/exec diff --git a/tests/security-manager-tests/test_DIR/app_dir/level_1/.level_2/exec b/tests/security-manager-tests/apps_rw/non_app_dir/.level_1/level_2/exec similarity index 100% rename from tests/security-manager-tests/test_DIR/app_dir/level_1/.level_2/exec rename to tests/security-manager-tests/apps_rw/non_app_dir/.level_1/level_2/exec diff --git a/tests/security-manager-tests/test_DIR/app_dir/level_1/normal b/tests/security-manager-tests/apps_rw/non_app_dir/.level_1/level_2/normal similarity index 100% rename from tests/security-manager-tests/test_DIR/app_dir/level_1/normal rename to tests/security-manager-tests/apps_rw/non_app_dir/.level_1/level_2/normal diff --git a/tests/security-manager-tests/test_DIR/app_dir/level_1/level_2/normal b/tests/security-manager-tests/apps_rw/non_app_dir/.level_1/normal similarity index 100% rename from tests/security-manager-tests/test_DIR/app_dir/level_1/level_2/normal rename to tests/security-manager-tests/apps_rw/non_app_dir/.level_1/normal diff --git a/tests/security-manager-tests/test_DIR/app_dir/exec b/tests/security-manager-tests/apps_rw/non_app_dir/exec similarity index 100% rename from tests/security-manager-tests/test_DIR/app_dir/exec rename to tests/security-manager-tests/apps_rw/non_app_dir/exec diff --git a/tests/security-manager-tests/test_DIR/app_dir/.level_1/level_2/exec b/tests/security-manager-tests/apps_rw/non_app_dir/level_1/.level_2/exec similarity index 100% rename from tests/security-manager-tests/test_DIR/app_dir/.level_1/level_2/exec rename to tests/security-manager-tests/apps_rw/non_app_dir/level_1/.level_2/exec diff --git a/tests/security-manager-tests/test_DIR/app_dir/level_1/.level_2/normal b/tests/security-manager-tests/apps_rw/non_app_dir/level_1/.level_2/normal similarity index 100% rename from tests/security-manager-tests/test_DIR/app_dir/level_1/.level_2/normal rename to tests/security-manager-tests/apps_rw/non_app_dir/level_1/.level_2/normal diff --git a/tests/security-manager-tests/test_DIR/app_dir/.level_1/exec b/tests/security-manager-tests/apps_rw/non_app_dir/level_1/exec similarity index 100% rename from tests/security-manager-tests/test_DIR/app_dir/.level_1/exec rename to tests/security-manager-tests/apps_rw/non_app_dir/level_1/exec diff --git a/tests/security-manager-tests/test_DIR/app_dir/.level_1/.level_2/exec b/tests/security-manager-tests/apps_rw/non_app_dir/level_1/level_2/exec similarity index 100% rename from tests/security-manager-tests/test_DIR/app_dir/.level_1/.level_2/exec rename to tests/security-manager-tests/apps_rw/non_app_dir/level_1/level_2/exec diff --git a/tests/security-manager-tests/test_DIR/app_dir/link_to_exec b/tests/security-manager-tests/apps_rw/non_app_dir/level_1/level_2/link_to_exec similarity index 100% rename from tests/security-manager-tests/test_DIR/app_dir/link_to_exec rename to tests/security-manager-tests/apps_rw/non_app_dir/level_1/level_2/link_to_exec diff --git a/tests/security-manager-tests/test_DIR/app_dir/link_to_non_exec b/tests/security-manager-tests/apps_rw/non_app_dir/level_1/level_2/link_to_non_exec similarity index 100% rename from tests/security-manager-tests/test_DIR/app_dir/link_to_non_exec rename to tests/security-manager-tests/apps_rw/non_app_dir/level_1/level_2/link_to_non_exec diff --git a/tests/security-manager-tests/test_DIR/app_dir/.level_1/normal b/tests/security-manager-tests/apps_rw/non_app_dir/level_1/level_2/normal similarity index 100% rename from tests/security-manager-tests/test_DIR/app_dir/.level_1/normal rename to tests/security-manager-tests/apps_rw/non_app_dir/level_1/level_2/normal diff --git a/tests/security-manager-tests/test_DIR/app_dir/level_1/link_to_exec b/tests/security-manager-tests/apps_rw/non_app_dir/level_1/link_to_exec similarity index 100% rename from tests/security-manager-tests/test_DIR/app_dir/level_1/link_to_exec rename to tests/security-manager-tests/apps_rw/non_app_dir/level_1/link_to_exec diff --git a/tests/security-manager-tests/test_DIR/app_dir/level_1/link_to_non_exec b/tests/security-manager-tests/apps_rw/non_app_dir/level_1/link_to_non_exec similarity index 100% rename from tests/security-manager-tests/test_DIR/app_dir/level_1/link_to_non_exec rename to tests/security-manager-tests/apps_rw/non_app_dir/level_1/link_to_non_exec diff --git a/tests/security-manager-tests/test_DIR/app_dir/.level_1/level_2/normal b/tests/security-manager-tests/apps_rw/non_app_dir/level_1/normal similarity index 100% rename from tests/security-manager-tests/test_DIR/app_dir/.level_1/level_2/normal rename to tests/security-manager-tests/apps_rw/non_app_dir/level_1/normal diff --git a/tests/security-manager-tests/test_DIR/app_dir/level_1/level_2/link_to_exec b/tests/security-manager-tests/apps_rw/non_app_dir/link_to_exec similarity index 100% rename from tests/security-manager-tests/test_DIR/app_dir/level_1/level_2/link_to_exec rename to tests/security-manager-tests/apps_rw/non_app_dir/link_to_exec diff --git a/tests/security-manager-tests/test_DIR/app_dir/level_1/level_2/link_to_non_exec b/tests/security-manager-tests/apps_rw/non_app_dir/link_to_non_exec similarity index 100% rename from tests/security-manager-tests/test_DIR/app_dir/level_1/level_2/link_to_non_exec rename to tests/security-manager-tests/apps_rw/non_app_dir/link_to_non_exec diff --git a/tests/security-manager-tests/test_DIR/app_dir/.level_1/.level_2/normal b/tests/security-manager-tests/apps_rw/non_app_dir/normal similarity index 100% rename from tests/security-manager-tests/test_DIR/app_dir/.level_1/.level_2/normal rename to tests/security-manager-tests/apps_rw/non_app_dir/normal diff --git a/tests/security-manager-tests/apps_rw/subdir/file b/tests/security-manager-tests/apps_rw/subdir/file new file mode 100644 index 0000000..e69de29 diff --git a/tests/security-manager-tests/security_manager_tests.cpp b/tests/security-manager-tests/security_manager_tests.cpp index b7ca82d..9234d03 100644 --- a/tests/security-manager-tests/security_manager_tests.cpp +++ b/tests/security-manager-tests/security_manager_tests.cpp @@ -58,9 +58,10 @@ static const privileges_t SM_NO_PRIVILEGES = { static const std::vector SM_ALLOWED_GROUPS = {"db_browser", "db_alarm"}; -static const char *const SM_RW_PATH = "/usr/apps/test_DIR/app_dir"; -static const char *const SM_RO_PATH = "/usr/apps/test_DIR/app_dir_public_ro"; -static const char *const SM_DENIED_PATH = "/usr/apps/test_DIR/non_app_dir"; +static const char *const SM_RW_PATH = "/usr/apps/app_dir"; +static const char *const SM_RO_PATH = "/usr/apps/app_dir_public_ro"; +static const char *const SM_DENIED_PATH = "/usr/apps/non_app_dir"; + static const char *const ANY_USER_REPRESENTATION = "anyuser";/*this may be actually any string*/ static const std::string EXEC_FILE("exec"); static const std::string NORMAL_FILE("normal"); @@ -831,6 +832,9 @@ RUNNER_CHILD_TEST(security_manager_07_user_add_app_install) test_user.create(); test_user.getUidString(uid_string); + removeTestDirs(test_user); + createTestDirs(test_user); + install_app(sm_app_id, sm_pkg_id, test_user.getUid()); check_app_after_install(sm_app_id, sm_pkg_id); @@ -848,7 +852,7 @@ RUNNER_CHILD_TEST(security_manager_08_user_double_add_double_remove) const char *const sm_app_id = "sm_test_08_app_id_user"; const char *const sm_pkg_id = "sm_test_08_pkg_id_user"; - const char *const new_user_name = "sm_test_08_user_name"; + const std::string new_user_name = "sm_test_08_user_name"; std::string uid_string; // gumd user add @@ -856,6 +860,9 @@ RUNNER_CHILD_TEST(security_manager_08_user_double_add_double_remove) test_user.create(); test_user.getUidString(uid_string); + removeTestDirs(test_user); + createTestDirs(test_user); + addUserRequest.setUid(test_user.getUid()); addUserRequest.setUserType(SM_USER_TYPE_NORMAL); @@ -882,22 +889,25 @@ RUNNER_CHILD_TEST(security_manager_09_add_user_offline) { const char *const app_id = "security_manager_09_add_user_offline_app"; const char *const pkg_id = "security_manager_09_add_user_offline_pkg"; - const std::string username("sm_test_09_user_name"); + const std::string new_user_name("sm_test_09_user_name"); ServiceManager serviceManager("security-manager.service"); serviceManager.maskService(); serviceManager.stopService(); - TemporaryTestUser user(username, GUM_USERTYPE_NORMAL, true); - user.create(); + TemporaryTestUser test_user(new_user_name, GUM_USERTYPE_NORMAL, true); + test_user.create(); + + removeTestDirs(test_user); + createTestDirs(test_user); - install_app(app_id, pkg_id, user.getUid()); + install_app(app_id, pkg_id, test_user.getUid()); check_app_after_install(app_id, pkg_id); serviceManager.unmaskService(); serviceManager.startService(); - user.remove(); + test_user.remove(); check_app_after_uninstall(app_id, pkg_id, true); } -- 2.7.4