Index: openacs-4/packages/acs-tcl/tcl/test/test-permissions-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/test/test-permissions-procs.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/acs-tcl/tcl/test/test-permissions-procs.tcl	27 Mar 2018 12:22:17 -0000	1.4
+++ openacs-4/packages/acs-tcl/tcl/test/test-permissions-procs.tcl	19 Jul 2018 11:43:19 -0000	1.5
@@ -33,52 +33,52 @@
  	permission::grant -party_id $user_id -object_id $new_package_id -privilege "admin"  
  	# Verifying the admin privilege on the user
         aa_true "testing admin privilege" \
- 	    [expr {[permission::permission_p -party_id $user_id -object_id $new_package_id -privilege "admin"] == 1}]
+ 	    {[permission::permission_p -party_id $user_id -object_id $new_package_id -privilege "admin"] == 1}
  	# Revoking admin privilege
  	permission::revoke -party_id $user_id -object_id $new_package_id -privilege "admin"
  	aa_true "testing if admin privilege was revoked" \
- 	    [expr {[permission::permission_p -party_id $user_id -object_id $new_package_id -privilege "admin"] == 0}]
+ 	    {[permission::permission_p -party_id $user_id -object_id $new_package_id -privilege "admin"] == 0}
 
 	# Grant read privilege
 	permission::grant -party_id $user_id -object_id $new_package_id -privilege "read"
  	# Verifying  the read privilege on the user
         aa_true "testing read permissions" \
-            [expr {[permission::permission_p -party_id $user_id -object_id $new_package_id -privilege "read" ] == 1}]
+            {[permission::permission_p -party_id $user_id -object_id $new_package_id -privilege "read" ] == 1}
         # Revoking read privilege
         permission::revoke -party_id $user_id -object_id $new_package_id -privilege "read"
 	# We tested with a query because we have problems with inherit
 	aa_true "testing if read privilege was revoked" \
-	    [expr {[db_string test_read "select 1 from acs_permissions where object_id = :new_package_id and grantee_id = :user_id" -default 0] ==  0}]
+	    {[db_string test_read "select 1 from acs_permissions where object_id = :new_package_id and grantee_id = :user_id" -default 0] ==  0}
 
         # Grant write privilege
   	permission::grant -party_id $user_id -object_id $new_package_id -privilege "write"
   	# Verifying the write privilege  on the user
   	aa_true "testing write permissions" \
-              [expr {[permission::permission_p -party_id $user_id -object_id  $new_package_id -privilege "write" ] == 1}]
+              {[permission::permission_p -party_id $user_id -object_id  $new_package_id -privilege "write" ] == 1}
  	# Revoking write privilege
  	permission::revoke -party_id $user_id -object_id $new_package_id -privilege "write"
  	aa_true "testing if write permissions was revoked" \
- 	    [expr {[permission::permission_p -party_id $user_id -object_id  $new_package_id -privilege "write" ] == 0}]
+ 	    {[permission::permission_p -party_id $user_id -object_id  $new_package_id -privilege "write" ] == 0}
 
   	# Grant create privilege
   	permission::grant -party_id $user_id -object_id $new_package_id -privilege "create"
   	# Verifying the create privilege  on the user
   	aa_true "testing create permissions" \
-            [expr {[permission::permission_p -party_id $user_id -object_id  $new_package_id -privilege "create" ] == 1}]
+            {[permission::permission_p -party_id $user_id -object_id  $new_package_id -privilege "create" ] == 1}
  	# Revoking create privilege
         permission::revoke -party_id $user_id -object_id $new_package_id -privilege "create"
         aa_true "testing if create privileges was revoked" \
-            [expr {[permission::permission_p -party_id $user_id -object_id  $new_package_id -privilege "create" ] == 0}]
+            {[permission::permission_p -party_id $user_id -object_id  $new_package_id -privilege "create" ] == 0}
 
  	# Grant delete privilege
  	permission::grant -party_id $user_id -object_id $new_package_id -privilege "delete"
  	# Verifying the delete privilege on the user
  	aa_true "testing delete permissions" \
-             [expr {[permission::permission_p -party_id $user_id -object_id  $new_package_id -privilege "delete" ] == 1}]
+             {[permission::permission_p -party_id $user_id -object_id  $new_package_id -privilege "delete" ] == 1}
  	# Revoking delete privilege
  	permission::revoke -party_id $user_id -object_id $new_package_id -privilege "delete"
          aa_true "testing if delete permissions was revoked" \
-             [expr {[permission::permission_p -party_id $user_id  -object_id  $new_package_id -privilege "delete" ]  == 0}]
+             {[permission::permission_p -party_id $user_id  -object_id  $new_package_id -privilege "delete" ]  == 0}
     } 
 }
 
@@ -101,27 +101,27 @@
 	#Grant permissions for this user in this object
 	permission::grant -party_id $user_id -object_id $new_package_id -privilege "delete"
 	aa_true "testing admin permissions" \
-	    [expr {[permission::permission_p -party_id $user_id -object_id  $new_package_id -privilege "delete" ] == 1}]
+	    {[permission::permission_p -party_id $user_id -object_id  $new_package_id -privilege "delete" ] == 1}
 	permission::revoke -party_id $user_id -object_id $new_package_id -privilege "delete"
 
         permission::grant -party_id $user_id -object_id $new_package_id -privilege "create"
 	aa_true "testing create permissions" \
-	    [expr {[permission::permission_p -party_id $user_id -object_id  $new_package_id -privilege "create" ] == 1}]
+	    {[permission::permission_p -party_id $user_id -object_id  $new_package_id -privilege "create" ] == 1}
 	permission::revoke -party_id $user_id -object_id $new_package_id -privilege "create"
 
         permission::grant -party_id $user_id -object_id $new_package_id -privilege "write"
 	aa_true "testing write permissions" \
-	    [expr {[permission::permission_p -party_id $user_id -object_id  $new_package_id -privilege "write" ] == 1}]
+	    {[permission::permission_p -party_id $user_id -object_id  $new_package_id -privilege "write" ] == 1}
         permission::revoke -party_id $user_id -object_id $new_package_id -privilege "write"
 
         permission::grant -party_id $user_id -object_id $new_package_id -privilege "read"
 	aa_true "testing read permissions" \
-	    [expr {[db_string test_read "select 1 from acs_permissions where object_id = :new_package_id and grantee_id = :user_id" -default 0] == 1}]
+	    {[db_string test_read "select 1 from acs_permissions where object_id = :new_package_id and grantee_id = :user_id" -default 0] == 1}
 	permission::revoke -party_id $user_id -object_id $new_package_id -privilege "read"
 
         permission::grant -party_id $user_id -object_id $new_package_id -privilege "admin"
 	aa_true "testing delete permissions" \
-	    [expr {[permission::permission_p -party_id $user_id -object_id  $new_package_id -privilege "admin" ] == 1}]
+	    {[permission::permission_p -party_id $user_id -object_id  $new_package_id -privilege "admin" ] == 1}
 	permission::revoke -party_id $user_id -object_id $new_package_id -privilege "admin"
     }
 }