Improve test failure clean up

testsuite/expect/inc3.11.8

@@ -91,19 +91,20 @@ proc inc3_11_8 {} {
 	set ret_code [create_res "StartTime=now Duration=60 NodeCnt=1 CoreCnt=$core_res_num User=$user_name" 0]
 	if {$ret_code != 0} {
 		send_user "\n\033\[31mFAILURE: Unable to create a valid reservation\033\[m\n"
+		cancel_job $job_id
 		exit $ret_code
 	}
 
 	if {$res_nodecnt != 1} {
 		send_user "\n\033\[31mFAILURE: reservation created with $res_nodecnt nodes when just 1 was requested\033\[m\n"
-		set exit_code 1
-		exit $ret_code
+		cancel_job $job_id
+		exit 1
 	}
 
 	if {$res_corecnt != $core_res_num} {
 		send_user "\n\033\[31mFAILURE: reservation created with $res_corecnt cores when just $core_res_num was requested\033\[m\n"
-		set exit_code 1
-		exit $ret_code
+		cancel_job $job_id
+		exit 1
 	}
 
 	send_user "\n\033\[32mSUCCESS: reservation was created as expected\033\[m\n"