Skip to content
Snippets Groups Projects
Commit ca39b938 authored by Albert Gil's avatar Albert Gil
Browse files

Testsuite - Add the user parameter to get_admin_level and is_super_user


This will help us to work with testsuite_user.

Bug 9313

Signed-off-by: default avatarChad Vizino <chad@schedmd.com>
parent 93e0ef6a
No related branches found
No related tags found
No related merge requests found
...@@ -3042,7 +3042,7 @@ proc get_total_cpus {} { ...@@ -3042,7 +3042,7 @@ proc get_total_cpus {} {
# is_super_user - determines if user is root or SlurmUser # is_super_user - determines if user is root or SlurmUser
# #
# SYNOPSIS # SYNOPSIS
# is_super_user # is_super_user ?user?
# #
# DESCRIPTION # DESCRIPTION
# Determine if user is a Slurm super user (i.e. user # Determine if user is a Slurm super user (i.e. user
...@@ -3053,10 +3053,12 @@ proc get_total_cpus {} { ...@@ -3053,10 +3053,12 @@ proc get_total_cpus {} {
# #
################################################################ ################################################################
proc is_super_user { } { proc is_super_user {{user ""}} {
global number global number
set user [get_my_user_name] if {$user == ""} {
set user [get_my_user_name]
}
# Check if user is root # Check if user is root
if {[string compare $user "root"] == 0} { if {[string compare $user "root"] == 0} {
...@@ -3462,30 +3464,31 @@ proc get_job_acct_freq { } { ...@@ -3462,30 +3464,31 @@ proc get_job_acct_freq { } {
################################################################ ################################################################
# #
# NAME # NAME
# get_admin_level - gets the AdminLevel for the current user # get_admin_level - gets the AdminLevel of the user
# #
# SYNOPSIS # SYNOPSIS
# get_admin_level # get_admin_level ?user?
# #
# RETURN VALUE # RETURN VALUE
# AdminLevel for the current user # 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 global sacctmgr re_word_str re_word_str bin_id
set admin_level "" set admin_level ""
set user_name ""
if {[is_super_user]} { if {$user_name == ""} {
return "Administrator" 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 {[is_super_user $user_name]} {
if { ![string length $user_name] } { return "Administrator"
log_error "No name returned from id"
return ""
} }
# #
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment