Modify sessiond integration tests to conform to the changes in setting

ownership of user app subdirectories

Change-Id: Ic7b33dc1783421288007f6d57a30173aff6b86d1

diff --git a/tests/integration/sessiond-integration-tests.sh b/tests/integration/sessiond-integration-tests.sh
index 883f8e3cc487341e7a6d6d4b674d7b6d7edc4f2c..4aea012f7beb8c89599533dad840f9399085b099 100755 (executable)
--- a/tests/integration/sessiond-integration-tests.sh
+++ b/tests/integration/sessiond-integration-tests.sh
@@ -110,8 +110,9 @@ done
 
 userid=$(getent passwd "$TESTUSER" | cut -d: -f3)
 homedir=$(getent passwd "$TESTUSER" | cut -d: -f6)
+apps_rwdir="${homedir}/apps_rw"
 
-verbose_echo "User id: $userid, home directory: $homedir"
+verbose_echo "User id: $userid, home directory: $homedir, apps_rw user directory: $apps_rwdir"
 
 create_test_users
 
@@ -128,12 +129,17 @@ for subsession in "${TEST_SUBSESSIONS[@]}"; do
        do
                verbose_echo "Checking $f..."
                templf="${f/"$subsession_dir"/$skeldir}"
+               userf="${f/"$subsession_dir"/$apps_rwdir}"
 
                # Check if permissions are correct
                usergroup=$(stat --format '%U:%G' "$f")
                user=$(echo "$usergroup" | cut -d: -f1)
                group=$(echo "$usergroup" | cut -d: -f2)
-               if [ "$user" != "$TESTUSER" ] || [ "$group" != "$GROUP" ]; then
+               u_usergroup=$(stat --format '%U:%G' "$userf")
+               u_user=$(echo "$u_usergroup" | cut -d: -f1)
+               u_group=$(echo "$u_usergroup" | cut -d: -f2)
+
+               if [ "$user" != "$TESTUSER" ] || [ "$group" != "$u_group" ]; then
                        echo "$f: incorrect permissions set!"
                        exit 1
                fi