diff --git a/testsuite/expect/globals b/testsuite/expect/globals index a4f4f8ebcf327ead2fb52d15b137b20dc25d1966..df540f6267052dac3d35b1f71eb5f0920056e9a7 100755 --- a/testsuite/expect/globals +++ b/testsuite/expect/globals @@ -3042,7 +3042,7 @@ proc get_total_cpus {} { # is_super_user - determines if user is root or SlurmUser # # SYNOPSIS -# is_super_user +# is_super_user ?user? # # DESCRIPTION # Determine if user is a Slurm super user (i.e. user @@ -3053,10 +3053,12 @@ proc get_total_cpus {} { # ################################################################ -proc is_super_user { } { +proc is_super_user {{user ""}} { global number - set user [get_my_user_name] + if {$user == ""} { + set user [get_my_user_name] + } # Check if user is root if {[string compare $user "root"] == 0} { @@ -3462,30 +3464,31 @@ proc get_job_acct_freq { } { ################################################################ # # NAME -# get_admin_level - gets the AdminLevel for the current user +# get_admin_level - gets the AdminLevel of the user # # SYNOPSIS -# get_admin_level +# get_admin_level ?user? # # RETURN VALUE # AdminLevel for the current user # ################################################################ -proc get_admin_level { } { +proc get_admin_level {{user_name ""}} { global sacctmgr re_word_str re_word_str bin_id set admin_level "" - set user_name "" - if {[is_super_user]} { - return "Administrator" + if {$user_name == ""} { + set user_name [get_my_user_name] + if { ![string length $user_name] } { + log_error "No name returned from id" + return "" + } } - set user_name [get_my_user_name] - if { ![string length $user_name] } { - log_error "No name returned from id" - return "" + if {[is_super_user $user_name]} { + return "Administrator" } #