Testsuite - Remove debug code temporarily added on 71fbb7ea and 473df3f0.

Bug 9665

testsuite/expect/test19.4

@@ -31,10 +31,6 @@ source ./globals
 set file_in      "test$test_id.input"
 set file_out     "test$test_id.output"
 
-# TODO: Temporary variables to debug bug 9665 (remove once fixed)
-set trigger_get_failed false
-set config_dir [get_conf_path]
-
 set uid [get_my_uid]
 set user [get_my_user_name]
 if {![regexp "${user}\\($number\\)" [get_config_param "SlurmUser"]] || $user eq "root"} {
@@ -51,35 +47,10 @@ make_bash_script $file_in "$bin_echo JOB COMPLETED >$cwd/$file_out"
 proc cleanup {} {
 	global bin_rm file_in file_out strigger uid
 
-	# TODO: Temporary debug for bug 9665 (remove once fixed)
-	global trigger_get_failed
-	if {$trigger_get_failed} {
-		if [
-			wait_for -timeout 5 -poll .1 {[
-				regexp "$file_in" [run_command_output "$strigger --get -v --reconfig --user=$uid"]
-			]} {}
-		] {
-			log_warn "Trigger get failed and never recovered"
-		} else {
-			log_warn "Trigger get failed but became available afterwards"
-		}
-	}
-	global config_dir scontrol
-	restore_conf $config_dir/slurm.conf
-	run_command "$scontrol reconfigure"
-
 	run_command -none -nolog "$strigger --clear --reconfig --user=$uid --quiet"
 	exec $bin_rm -f $file_in $file_out
 }
 
-# TODO: Temporarily increase logging to debug bug 9665 (remove once fixed)
-save_conf $config_dir/slurm.conf
-run_command -none "$bin_echo SlurmctldDebug=debug3 >> $config_dir/slurm.conf"
-run_command -none "$bin_echo DebugFlags=Triggers >> $config_dir/slurm.conf"
-run_command -fail "$scontrol reconfigure"
-wait_for -timeout 5 -pollinterval .1 {[get_config_param "SlurmctldDebug"] eq "debug3"} {}
-wait_for -timeout 5 -pollinterval .1 {[get_config_param "DebugFlags"] eq "Triggers"} {}
-
 run_command -fail "$strigger --clear --quiet --user=$uid"
 
 # Submit a job and create a trigger on a job completion event
@@ -91,8 +62,6 @@ if {![regexp "trigger set" [run_command_output -fail "$strigger --set -v --jobid
 
 # Verify that the trigger has been created
 if {![regexp "$file_in" [run_command_output -fail "$strigger --get -v --jobid=$job_id --fini --user=$uid"]]} {
-	# TODO: Temporary variable to debug bug 9665 (remove once fixed)
-	set trigger_get_failed true
 	fail "Trigger get failure"
 }