Refined test to only add a cluster, but with all available options.

testsuite/expect/test21.5

 #!/usr/bin/expect
 ############################################################################
 # Purpose: Test of SLURM functionality
-#          sacctmgr add, list, and delete a cluster
+#          sacctmgr add a cluster
 #
 # Output:  "TEST: #.#" followed by "SUCCESS" if test was successful, OR
 #          "FAILURE: ..." otherwise with an explanation of the failure, OR
@@ -33,16 +33,28 @@ source ./globals
 
 set test_id     "21.5"
 set exit_code   0
-set amatches     0
-set lmatches     0
-set dmatches     0
+set amatches    0
+set lmatches    0
+set dmatches    0
 set not_support 0
 set add		add
 set lis		list
 set del		delete
 set mod		modify
+set nams	Names
+set nam		Name
+set fs		Fairshare
+set mc		MaxCPUSecs
+set mj		MaxJobs
+set mn		MaxNodes
+set mw		MaxWall
 set clu		cluster
 set tc1		tCluster1
+set fs1		2500
+set mc1		1000000
+set mj1		50
+set mn1		300
+set mw1		01:00:00
 
 
 print_header $test_id
@@ -50,57 +62,52 @@ print_header $test_id
 #
 # Use sacctmgr to create a cluster
 #
-set sadd_pid [spawn $sacctmgr $add $clu $tc1]
+set sadd_pid [spawn $sacctmgr $add $clu $nams=$tc1 $fs=$fs1 $mc=$mc1 $mj=$mj1 $mn=$mn1 $mw=$mw1]
 expect {
 	-re "Adding Cluster" {
 		incr amatches
 		exp_continue
 	}
-	-re "Name *= $tc1" {
+	-re "$nam *= $tc1" {
 		incr amatches
 		exp_continue
 	}
-	-re "Would you like to commit changes\\\? \\\(You have 30 seconds to decide\\\)" {
+	-re "User Defaults" {
 		incr amatches
 		exp_continue
 	}
-	-re "\\\(N\\\/y\\\):" {
+	-re "$fs *= $fs1" {
 		incr amatches
-		send "Y\r"
 		exp_continue
 	}
-	timeout {
-		send_user "\nFAILURE: sacctmgr add not responding\n"
-		slow_kill $sadd_pid
-		set exit_code 1
+	-re "$mc *= $mc1" {
+		incr amatches
+		exp_continue
 	}
-	eof {
-		wait
+	-re "$mj *= $mj1" {
+		incr amatches
+		exp_continue
 	}
-}
-
-if {$amatches != 4} {
-	send_user "\nFAILURE:  sacctmgr had a problem adding clusters\n"
-	set exit_code 1
-}
-
-#
-# Use sacctmgr to list the addition of cluster
-#
-set slist_pid [spawn $sacctmgr $lis $clu $tc1]
-expect {
-	-re "Name" {
-		incr lmatches
+	-re "$mn *= $mn1" {
+		incr amatches
 		exp_continue
 	}
-	-re "$tc1" {
-		incr lmatches
+	-re "$mw *= $mw1" {
+		incr amatches
+		exp_continue
+	}
+	-re "Would you like to commit changes\\\? \\\(You have 30 seconds to decide\\\)" {
+		incr amatches
+		exp_continue
+	}
+	-re "\\\(N\\\/y\\\):" {
+		incr amatches
+		send "Y\r"
 		exp_continue
-		send_user "\nFound $tc1 in database\n"
 	}
 	timeout {
-		send_user "\nFAILURE: sacctmgr list not responding\n"
-		slow_kill $slist_pid
+		send_user "\nFAILURE: sacctmgr add not responding\n"
+		slow_kill $sadd_pid
 		set exit_code 1
 	}
 	eof {
@@ -108,8 +115,8 @@ expect {
 	}
 }
 
-if {$lmatches != 2} {
-	send_user "\nFAILURE:  sacctmgr had a problem listing clusters\n"
+if {$amatches != 10} {
+	send_user "\nFAILURE:  sacctmgr had a problem adding clusters\n"
 	set exit_code 1
 }