From 9d269d7ca35dd1cc82461546fd1819ae03a3c0d8 Mon Sep 17 00:00:00 2001
From: Isaac Hartung <ihartung@schedmd.com>
Date: Thu, 19 Jan 2017 12:54:41 -0700
Subject: [PATCH] Testsuite: change get_my_nuid to get_my_user_name and use
 consistently.

Modify get_my_user_name to return a FAILURE if the user_name cannot
be determined, as was handled inconsistently.
---
 testsuite/expect/globals   | 43 +++++++++++++-------------------------
 testsuite/expect/test1.19  | 11 ++--------
 testsuite/expect/test1.48  | 17 +--------------
 testsuite/expect/test1.74  |  2 +-
 testsuite/expect/test12.3  |  2 +-
 testsuite/expect/test12.4  | 24 ++++-----------------
 testsuite/expect/test17.20 | 17 +--------------
 testsuite/expect/test17.5  | 11 ++--------
 testsuite/expect/test17.51 | 10 +--------
 testsuite/expect/test17.64 | 11 +---------
 testsuite/expect/test2.18  | 15 +------------
 testsuite/expect/test2.19  | 15 +------------
 testsuite/expect/test2.25  | 11 +---------
 testsuite/expect/test21.21 | 13 ++----------
 testsuite/expect/test21.23 | 13 ++----------
 testsuite/expect/test21.30 |  2 +-
 testsuite/expect/test21.34 | 11 +---------
 testsuite/expect/test21.35 |  2 +-
 testsuite/expect/test23.2  | 13 +-----------
 testsuite/expect/test25.1  |  6 +++---
 testsuite/expect/test3.11  | 10 +--------
 testsuite/expect/test3.14  | 10 +--------
 testsuite/expect/test3.15  | 10 +--------
 testsuite/expect/test34.2  | 16 ++------------
 testsuite/expect/test37.4  | 10 +--------
 testsuite/expect/test5.6   | 13 +++---------
 testsuite/expect/test5.9   | 11 +---------
 testsuite/expect/test6.10  | 18 +---------------
 testsuite/expect/test8.24  | 11 +---------
 testsuite/expect/test9.8   | 13 +-----------
 30 files changed, 56 insertions(+), 315 deletions(-)

diff --git a/testsuite/expect/globals b/testsuite/expect/globals
index c33bd216382..a120e415bd3 100755
--- a/testsuite/expect/globals
+++ b/testsuite/expect/globals
@@ -321,7 +321,7 @@ proc slow_kill { pid } {
 
 ################################################################
 #
-# Proc: get_my_nuid
+# Proc: get_my_user_name
 #
 # Purpose:  gets the name uid from the running user
 #
@@ -330,16 +330,16 @@ proc slow_kill { pid } {
 #
 ################################################################
 
-proc get_my_nuid {  } {
+proc get_my_user_name {  } {
 	global bin_id alpha alpha_numeric
 
-	set uid -1
+	set user_name -1
 
 	log_user 0
 	spawn $bin_id -nu
 	expect {
 		-re "($alpha_numeric|$alpha)" {
-			set nuid $expect_out(1,string)
+			set user_name $expect_out(1,string)
 			exp_continue
 		}
 		eof {
@@ -348,7 +348,12 @@ proc get_my_nuid {  } {
 	}
 	log_user 1
 
-	return $nuid
+	if {$user_name == -1} {
+		send_user "\nFAILURE: Unable to get user name\n"
+		exit 1
+	}
+
+	return $user_name
 }
 
 ################################################################
@@ -1528,7 +1533,7 @@ proc get_default_acct { user } {
 	set def_acct ""
 
 	if { !$user } {
-		set user [get_my_nuid]
+		set user [get_my_user_name]
 	}
 
 	spawn $sacctmgr -n list user $user format="DefaultAccount"
@@ -2083,17 +2088,8 @@ proc test_super_user { } {
 #
 #	Check if SlurmUser
 #
-	spawn $bin_id -un
-	set user ""
-	expect {
-		-re "($alpha_numeric_under)" {
-			set user $expect_out(1,string)
-			exp_continue
-		}
-		eof {
-			wait
-		}
-	}
+	set user [get_my_user_name]
+
 	spawn $scontrol show config
 	set slurm_user ""
 	expect {
@@ -2404,7 +2400,7 @@ proc is_super_user { } {
 	global alpha_numeric_under bin_id scontrol
 
 	log_user 0
-	set user_name [get_my_nuid]
+	set user_name [get_my_user_name]
 	if {[string compare $user_name "root"] == 0} {
 		log_user 1
 		return 1
@@ -2592,16 +2588,7 @@ proc check_accounting_admin_level { } {
 
 	log_user 0
 
-	spawn $bin_id -u -n
-	expect {
-		-re "($alpha_numeric_under)" {
-			set user_name $expect_out(1,string)
-			exp_continue
-		}
-		eof {
-			wait
-		}
-	}
+	set user_name [get_my_user_name]
 
 	if { ![string length $user_name] } {
 		send_user "FAILURE: No name returned from id\n"
diff --git a/testsuite/expect/test1.19 b/testsuite/expect/test1.19
index 69eecb649c5..ac7e7e3113a 100755
--- a/testsuite/expect/test1.19
+++ b/testsuite/expect/test1.19
@@ -75,15 +75,8 @@ if {[test_launch_poe]} {
 #
 # Gets current user
 #
-spawn $bin_id -un
-expect {
-	-re "($alpha_numeric_under)" {
-		set user_name $expect_out(1,string)
-	}
-	eof {
-		wait
-	}
-}
+
+set user_name [get_my_user_name]
 
 #
 # Spawn a program that generates "task_id" (%t) in stdout file names
diff --git a/testsuite/expect/test1.48 b/testsuite/expect/test1.48
index 472f5fb3d97..a5c1ea4dc22 100755
--- a/testsuite/expect/test1.48
+++ b/testsuite/expect/test1.48
@@ -48,22 +48,7 @@ if {[test_front_end] != 0 && [test_super_user] == 0} {
 # Execute 'id' to determine my user and group ID...
 #
 
-spawn $bin_id -un
-expect {
-        -re "($alpha_numeric_under)" {
-		set login_grp_info $expect_out(1,string)
-		set got_login_grps 1
-		exp_continue
-	}
-	eof {
-		wait
-	}
-}
-
-if {$got_login_grps == 0} {
-	send_user "\nFAILURE: Unable to get user and group ID info\n"
-	exit 1
-}
+set login_grp_info [get_my_user_name]
 
 #
 # Submit a slurm job that will execute 'id'
diff --git a/testsuite/expect/test1.74 b/testsuite/expect/test1.74
index deeaecec308..9ba59d5d753 100755
--- a/testsuite/expect/test1.74
+++ b/testsuite/expect/test1.74
@@ -66,7 +66,7 @@ if { [test_using_slurmdbd] == 0 } {
 	exit $exit_code
 }
 
-set user [get_my_nuid]
+set user [get_my_user_name]
 
 proc cleanup { } {
 	global acct acct_c1 acct_c2 exit_code qos
diff --git a/testsuite/expect/test12.3 b/testsuite/expect/test12.3
index 01a81dbf2df..6a176710c4b 100755
--- a/testsuite/expect/test12.3
+++ b/testsuite/expect/test12.3
@@ -94,7 +94,7 @@ if { $node_count < 3 } {
 # Identify the user and his current default account
 #
 set acct_name ""
-set user_name [get_my_nuid]
+set user_name [get_my_user_name]
 set s_pid [spawn $sacctmgr show user $user_name]
 expect {
 	-re "$user_name *($alpha_numeric_under)" {
diff --git a/testsuite/expect/test12.4 b/testsuite/expect/test12.4
index f7f23838bc9..fb4eec2702e 100755
--- a/testsuite/expect/test12.4
+++ b/testsuite/expect/test12.4
@@ -61,27 +61,9 @@ set cluster [get_cluster_name]
 set acct_name ""
 set user_name ""
 set user_gid ""
-spawn $bin_id -u -n
-expect {
-	 -re "($alpha_numeric_under)" {
-		set user_name $expect_out(1,string)
-		exp_continue
-	}
-	eof {
-		wait
-	}
-}
+set user_name [get_my_user_name]
 
-spawn $bin_id -g
-expect {
-	 -re "($alpha_numeric_under)" {
-		set user_gid $expect_out(1,string)
-		exp_continue
-	}
-	eof {
-		wait
-	}
-}
+set user_gid [get_my_gid]
 
 set s_pid [spawn $sacctmgr show user $user_name]
 expect {
@@ -143,6 +125,7 @@ expect {
 	}
 }
 
+
 #
 # Spawn a job via srun using this account
 #
@@ -724,6 +707,7 @@ if {$job_id == 0} {
 #
 # Use sacctmgr to delete the test account
 #
+
 set damatches 0
 set sadel_pid [spawn $sacctmgr -i delete account $test_acct]
 expect {
diff --git a/testsuite/expect/test17.20 b/testsuite/expect/test17.20
index 68150b37598..265ee5cf4dd 100755
--- a/testsuite/expect/test17.20
+++ b/testsuite/expect/test17.20
@@ -50,22 +50,7 @@ if {[test_front_end] != 0 && [test_super_user] == 0} {
 # Execute 'id' to determine my user and group ID...
 #
 
-spawn $bin_id -un
-expect {
-        -re "($alpha_numeric_under)" {
-		set login_grp_info $expect_out(1,string)
-		set got_login_grps 1
-		exp_continue
-	}
-	eof {
-		wait
-	}
-}
-
-if {$got_login_grps == 0} {
-	send_user "\nFAILURE: Unable to get user and group ID info\n"
-	exit 1
-}
+set login_grp_info [get_my_user_name]
 
 #
 # Delete left-over input script
diff --git a/testsuite/expect/test17.5 b/testsuite/expect/test17.5
index 2bacaeb01ef..ae912aa1218 100755
--- a/testsuite/expect/test17.5
+++ b/testsuite/expect/test17.5
@@ -73,15 +73,8 @@ make_bash_script $file_script "
 #
 # Get the name of the current user
 #
-spawn $bin_id -un
-expect {
-	-re "($alpha_numeric_under)" {
-		set user_name $expect_out(1,string)
-	}
-	eof {
-		wait
-	}
-}
+
+set user_name [get_my_user_name]
 
 #
 # Spawn a sbatch command to verify that the default output file is
diff --git a/testsuite/expect/test17.51 b/testsuite/expect/test17.51
index 9fedccd3d7b..ea2e5818ec6 100755
--- a/testsuite/expect/test17.51
+++ b/testsuite/expect/test17.51
@@ -201,15 +201,7 @@ if {$job_id == 0} {
 	exit 1
 }
 
-spawn $bin_id -un
-expect {
-	-re "($alpha_numeric_under)" {
-		set user_name $expect_out(1,string)
-	}
-	eof {
-		wait
-	}
-}
+set user_name [get_my_user_name]
 
 set found 0
 spawn $squeue --jobs=$job_id --noheader -O "mcslabel"
diff --git a/testsuite/expect/test17.64 b/testsuite/expect/test17.64
index 4e70239dd76..e9529d373b3 100755
--- a/testsuite/expect/test17.64
+++ b/testsuite/expect/test17.64
@@ -211,16 +211,7 @@ if {$job_id == 0} {
 }
 
 set user_name "NOT_SET"
-spawn $bin_id -n -u
-expect {
-	-re "($alpha_numeric_under)" {
-		set user_name $expect_out(1,string)
-		exp_continue
-	}
-	eof {
-		wait
-	}
-}
+set user_name [get_my_user_name]
 
 set account_name "NOT_SET"
 spawn $bin_bash -c "exec $sacctmgr -nP list user user=$user_name format=defaultaccount"
diff --git a/testsuite/expect/test2.18 b/testsuite/expect/test2.18
index 1c2751a7177..23f4bbfa0ec 100755
--- a/testsuite/expect/test2.18
+++ b/testsuite/expect/test2.18
@@ -197,20 +197,7 @@ proc test_part { acct part acct_con } {
 # Remove any vestigial accounts or partitions
 cleanup
 
-spawn $bin_id -un
-expect {
-	-re "($alpha_numeric_under)" {
-		set user_name $expect_out(1,string)
-		exp_continue
-	}
-	timeout {
-		send_user "\nFAILURE: id is not responding\n"
-		set exit_code 1
-	}
-	eof {
-		wait
-	}
-}
+set user_name [get_my_user_name]
 
 if { [string length $partition] == 0 } {
 	 set partition [default_partition]
diff --git a/testsuite/expect/test2.19 b/testsuite/expect/test2.19
index 9bece3990d3..8831d32d49b 100755
--- a/testsuite/expect/test2.19
+++ b/testsuite/expect/test2.19
@@ -229,20 +229,7 @@ proc test_part {acct qos part qos_con } {
 # Delete any vestigial qos or accounts
 cleanup
 
-spawn $bin_id -un
-expect {
-	-re "($alpha_numeric_under)" {
-		set user_name $expect_out(1,string)
-		exp_continue
-	}
-	timeout {
-		send_user "\nFAILURE: id is not responding\n"
-		set exit_code 1
-	}
-	eof {
-		wait
-	}
-}
+set user_name [get_my_user_name]
 
 # Setup
 set partition [default_partition]
diff --git a/testsuite/expect/test2.25 b/testsuite/expect/test2.25
index 9e7dbe3677f..4a77bb1f777 100755
--- a/testsuite/expect/test2.25
+++ b/testsuite/expect/test2.25
@@ -122,16 +122,7 @@ proc delete_test_acct { } {
 delete_test_acct
 
 # Get username
-spawn $bin_id -u -n
-expect {
-	-re "($alpha_numeric_under)" {
-		set test_user $expect_out(1,string)
-		exp_continue
-	}
-	eof {
-		wait
-	}
-}
+set test_user [get_my_user_name]
 
 if {[test_using_slurmdbd]} {
 	# Add test Account
diff --git a/testsuite/expect/test21.21 b/testsuite/expect/test21.21
index 4f40dd04403..0660aa6f8fd 100755
--- a/testsuite/expect/test21.21
+++ b/testsuite/expect/test21.21
@@ -258,17 +258,8 @@ if { [string compare [check_accounting_admin_level] "Administrator"] } {
 # Identify the user and his current default account
 #
 set acct_name ""
-set user_name ""
-spawn $bin_id -u -n
-expect {
-	 -re "($alpha_numeric_under)" {
-		set user_name $expect_out(1,string)
-		exp_continue
-	}
-	eof {
-		wait
-	}
-}
+set user_name [get_my_user_name]
+
 set s_pid [spawn $sacctmgr show user $user_name]
 expect {
 	-re "$user_name *($alpha_numeric_under)" {
diff --git a/testsuite/expect/test21.23 b/testsuite/expect/test21.23
index a0eee482556..4714d4f6760 100755
--- a/testsuite/expect/test21.23
+++ b/testsuite/expect/test21.23
@@ -66,17 +66,8 @@ set cn [get_cluster_name]
 # Identify the user and his current default account
 #
 set acct_name ""
-set user_name ""
-spawn $bin_id -u -n
-expect {
-	 -re "($alpha_numeric_under)" {
-		set user_name $expect_out(1,string)
-		exp_continue
-	}
-	eof {
-		wait
-	}
-}
+set user_name [get_my_user_name]
+
 set s_pid [spawn $sacctmgr show user $user_name]
 expect {
 	-re "$user_name *($alpha_numeric_under)" {
diff --git a/testsuite/expect/test21.30 b/testsuite/expect/test21.30
index 56a84374bf2..43165ec2d68 100755
--- a/testsuite/expect/test21.30
+++ b/testsuite/expect/test21.30
@@ -382,7 +382,7 @@ expect {
 }
 
 # Gets user
-set user_name [get_my_nuid]
+set user_name [get_my_user_name]
 
 
 # add qos
diff --git a/testsuite/expect/test21.34 b/testsuite/expect/test21.34
index cb80ee5d422..45b840e52ab 100755
--- a/testsuite/expect/test21.34
+++ b/testsuite/expect/test21.34
@@ -372,16 +372,7 @@ if {$totcpus == 0} {
 }
 
 # Gets user
-spawn $bin_id -u -n
-expect {
-	-re "($alpha_numeric_under)" {
-		set user_name $expect_out(1,string)
-		exp_continue
-	}
-	eof {
-		wait
-	}
-}
+set user_name [get_my_user_name]
 
 # Add account with qos
 set acctmatch 0
diff --git a/testsuite/expect/test21.35 b/testsuite/expect/test21.35
index 10e18a3496f..ff4bf3c952e 100755
--- a/testsuite/expect/test21.35
+++ b/testsuite/expect/test21.35
@@ -251,7 +251,7 @@ if {$match != 1} {
 	exit 1
 }
 
-spawn $sacctmgr -i create user name=[get_my_nuid] account=$test_acct
+spawn $sacctmgr -i create user name=[get_my_user_name] account=$test_acct
 expect {
 	timeout {
 		send_user"\nFAILURE: sacctmgr is not responding\n"
diff --git a/testsuite/expect/test23.2 b/testsuite/expect/test23.2
index e1602f5bdce..3f219f5043a 100755
--- a/testsuite/expect/test23.2
+++ b/testsuite/expect/test23.2
@@ -83,18 +83,7 @@ if { [string compare [check_accounting_admin_level] "Administrator"] } {
 # Identify the user and his current default account
 #
 set acct_name ""
-set user_name ""
-spawn $bin_id -u -n
-expect {
-	 -re "($alpha_numeric_under)" {
-		set user_name $expect_out(1,string)
-		exp_continue
-	}
-	eof {
-		wait
-	}
-}
-
+set user_name [get_my_user_name]
 
 set s_pid [spawn $sacctmgr show user $user_name]
 expect {
diff --git a/testsuite/expect/test25.1 b/testsuite/expect/test25.1
index d225f3cc0b0..9d74e357a68 100755
--- a/testsuite/expect/test25.1
+++ b/testsuite/expect/test25.1
@@ -655,7 +655,7 @@ send_user "\nSubmitted 2 jobs successfully\n\n"
 #
 # Collect uid
 #
-set nuid [get_my_nuid]
+set user_name [get_my_user_name]
 
 #
 # Start testing sprio options and arguments
@@ -689,10 +689,10 @@ if {!$exit_code} {
 	sprio_args --format -j $jobid2
 }
 if {!$exit_code} {
-	sprio_args -u $nuid $jobid2
+	sprio_args -u $user_name $jobid2
 }
 if {!$exit_code} {
-	sprio_args --user= $nuid $jobid2
+	sprio_args --user= $user_name $jobid2
 }
 if {!$exit_code} {
 	sprio_args -v -j $jobid2
diff --git a/testsuite/expect/test3.11 b/testsuite/expect/test3.11
index 6d1dd132e7e..29f3e7afb83 100755
--- a/testsuite/expect/test3.11
+++ b/testsuite/expect/test3.11
@@ -450,15 +450,7 @@ if {$part_cores == 0} {
 #
 # Get the user name
 #
-spawn $bin_id -un
-expect {
-	-re "($alpha_numeric_under)" {
-		set user_name $expect_out(1,string)
-	}
-	eof {
-		wait
-	}
-}
+set user_name [get_my_user_name]
 
 set cons_res_actived 0
 if {$def_oversubscribe_force == 0} {
diff --git a/testsuite/expect/test3.14 b/testsuite/expect/test3.14
index 3e41dfbdf38..d85ae55c8e7 100755
--- a/testsuite/expect/test3.14
+++ b/testsuite/expect/test3.14
@@ -55,15 +55,7 @@ if {$nb_nodes < 3} {
 	exit 0
 }
 
-spawn $bin_id -un
-expect {
-	-re "($alpha_numeric_under)" {
-		set user_name $expect_out(1,string)
-	}
-	eof {
-		wait
-	}
-}
+set user_name [get_my_user_name]
 
 #
 # Create the advanced reservation
diff --git a/testsuite/expect/test3.15 b/testsuite/expect/test3.15
index c07cee143c4..49d7130b329 100755
--- a/testsuite/expect/test3.15
+++ b/testsuite/expect/test3.15
@@ -193,15 +193,7 @@ if {[test_select_type_params "MEMORY"]} {
 	set job_mem  1
 }
 
-spawn $bin_id -un
-expect {
-	-re "($alpha_numeric_under)" {
-		set user_name $expect_out(1,string)
-	}
-	eof {
-		wait
-	}
-}
+set user_name [get_my_user_name]
 
 #
 # Add licenses to system configuration, 8 licenses named "test3.15"
diff --git a/testsuite/expect/test34.2 b/testsuite/expect/test34.2
index ab36c6d29f9..2d74105be56 100755
--- a/testsuite/expect/test34.2
+++ b/testsuite/expect/test34.2
@@ -257,20 +257,8 @@ proc check_state { exp_state job_id } {
 
 make_bash_script $file_in "sleep 30"
 
-spawn $bin_id -un
-expect {
-	-re "($alpha_numeric_under)" {
-		set user $expect_out(1,string)
-		exp_continue
-	}
-	timeout {
-		send_user "\nFAILURE: id is not responding\n"
-		set exit_code 1
-	}
-	eof {
-		wait
-	}
-}
+set user [get_my_user_name]
+
 
 ###################### Test preempt cancel ######################
 send_user "\n*** TEST PREEMPT CANCEL ***\n"
diff --git a/testsuite/expect/test37.4 b/testsuite/expect/test37.4
index f3f0cf78d00..acfc9350442 100755
--- a/testsuite/expect/test37.4
+++ b/testsuite/expect/test37.4
@@ -212,15 +212,7 @@ if {[test_cluster_up $fedc1] ||
 	end_it 1
 }
 
-spawn $bin_id -un
-expect {
-	-re "($alpha_numeric_under)" {
-		set user_name $expect_out(1,string)
-	}
-	eof {
-		wait
-	}
-}
+set user_name [get_my_user_name]
 
 # Remove existing setup
 if {[cleanup] != 0} {
diff --git a/testsuite/expect/test5.6 b/testsuite/expect/test5.6
index 824894c964a..bc15c34578e 100755
--- a/testsuite/expect/test5.6
+++ b/testsuite/expect/test5.6
@@ -161,16 +161,9 @@ expect {
 #
 # Check the squeue user filter option with name
 #
-spawn $bin_id -un
-expect {
-	-re "($alpha_numeric_under)" {
-		set this_user $expect_out(1,string)
-		exp_continue
-	}
-	eof {
-		wait
-	}
-}
+
+set this_user [get_my_user_name]
+
 spawn $squeue --format=%u --noheader --user=$this_user
 expect {
 	-re "($alpha_numeric_under)" {
diff --git a/testsuite/expect/test5.9 b/testsuite/expect/test5.9
index 1e6da8a7751..f2c72a65048 100755
--- a/testsuite/expect/test5.9
+++ b/testsuite/expect/test5.9
@@ -202,16 +202,7 @@ if {$sq_format(ntpersocket) == 0 || $sq_format(cpuspertask) == 0} {
 exec $bin_rm $tmp_sc
 cancel_job $tmp_job
 
-spawn $bin_id -un
-expect {
-	-re "($alpha_numeric_under)" {
-		set sq_format(username) $expect_out(1,string)
-		exp_continue
-	}
-	eof {
-		wait
-	}
-}
+set sq_format(username) [get_my_user_name]
 
 set match 0
 spawn $sacctmgr add -i account $test_acct
diff --git a/testsuite/expect/test6.10 b/testsuite/expect/test6.10
index 0f56703e56e..dab9e0d7d58 100755
--- a/testsuite/expect/test6.10
+++ b/testsuite/expect/test6.10
@@ -53,23 +53,7 @@ if {[job_submit_all_partitions] != 0} {
 # Execute 'id' to determine my login name
 #
 
-set got_login 0
-spawn $bin_id -un
-expect {
-        -re "($alpha_numeric_under)" {
-		set my_login $expect_out(1,string)
-		set got_login 1
-		exp_continue
-	}
-	eof {
-		wait
-	}
-}
-
-if { $got_login == 0 } {
-	send_user "\nFAILURE: Unable to get login name\n"
-	exit 1
-}
+set my_login [get_my_user_name]
 
 #
 # Build input script file
diff --git a/testsuite/expect/test8.24 b/testsuite/expect/test8.24
index 7b7b51142a4..b5ab4df3ec1 100755
--- a/testsuite/expect/test8.24
+++ b/testsuite/expect/test8.24
@@ -232,16 +232,7 @@ send_user "\nNodeCnt=$def_node_cnt\n"
 #
 # Get the user name
 #
-spawn $bin_id -un
-expect {
-	-re "($alpha_numeric_under)" {
-		set user_name $expect_out(1,string)
-	}
-	eof {
-		wait
-	}
-}
-
+set user_name [get_my_user_name]
 
 #
 # Make a list of lists with a series of parameters to test.  All the tests
diff --git a/testsuite/expect/test9.8 b/testsuite/expect/test9.8
index b1b151dbeb5..4fae83e06ca 100755
--- a/testsuite/expect/test9.8
+++ b/testsuite/expect/test9.8
@@ -118,18 +118,7 @@ if {$start_cnt < $job_cnt} {
 	send_user "\nAll $start_cnt jobs submitted\n"
 }
 
-set user_name ""
-
-spawn $bin_id -un
-expect {
-	-re "($alpha_numeric_under)" {
-		set user_name $expect_out(1,string)
-	}
-	eof {
-		wait
-	}
-
-}
+set user_name [get_my_user_name]
 
 #
 # There could be hundreds of job steps, we don't want to see
-- 
GitLab