update test scenarios to use macro

Author: vojtapolasek

linux_os/guide/system/accounts/accounts-session/accounts_user_interactive_home_directory_on_separate_partition/tests/home_on_root_partition.fail.sh

@@ -2,8 +2,7 @@
 # platform = multi_platform_all
 # remediation = none
 
-awk -F':' '{if ($3>={{{ uid_min }}} && $3!= {{{ nobody_uid }}}) print $1}' /etc/passwd \
-        | xargs -I{} userdel -r {}
+{{{ bash_remove_interactive_users_from_passwd_by_uid() }}}
 
 mkdir -p /root_home
 useradd -m -d /root_home/testUser1 testUser1

linux_os/guide/system/accounts/accounts-session/accounts_user_interactive_home_directory_on_separate_partition/tests/home_on_separate_partition.pass.sh

@@ -3,8 +3,7 @@
 
 . $SHARED/partition.sh
 
-awk -F':' '{if ($3>={{{ uid_min }}} && $3!= {{{ nobody_uid }}}) print $1}' /etc/passwd \
-        | xargs -I{} userdel -r {}
+{{{ bash_remove_interactive_users_from_passwd_by_uid() }}}
 
 umount /srv || true
 

linux_os/guide/system/accounts/accounts-session/accounts_user_interactive_home_directory_on_separate_partition/tests/mixed_users_one_on_root.fail.sh

@@ -4,8 +4,7 @@
 
 . $SHARED/partition.sh
 
-awk -F':' '{if ($3>={{{ uid_min }}} && $3!= {{{ nobody_uid }}}) print $1}' /etc/passwd \
-        | xargs -I{} userdel -r {}
+{{{ bash_remove_interactive_users_from_passwd_by_uid() }}}
 
 umount /srv || true