testsuite - refactor test3.15 to avoid memory enforcement.

Commit 63b7e3a8 changed the --mem limit to 1MB for the step if
not using a memory SelectType, but this can cause the job to fail
if the JobAcctGatherFrequency is frequent enough to notice that the
"sleep" command is using more than 1MB of resources.

Refactor test to avoid specifying job memory. Use --wrap to avoid
creating a temporary job script.

testsuite/expect/test3.15

@@ -32,7 +32,6 @@ source ./globals
 
 set test_id		"3.15"
 set exit_code		0
-set script_name         "test$test_id.bash"
 set license_name        "test$test_id"
 set resv_name           "resv$test_id"
 set user_name		""
@@ -57,10 +56,9 @@ proc reconfigure { } {
 }
 
 proc submit_job { license_count } {
-	global script_name bin_sleep license_name sbatch number exit_code job_mem
+	global bin_sleep license_name sbatch number exit_code
 	set job_id 0
-	make_bash_script $script_name "$bin_sleep 300"
-	spawn $sbatch -n1 -t1 -o /dev/null -L $license_name:$license_count --mem=${job_mem} $script_name
+	spawn $sbatch -n1 -t1 -o /dev/null -L $license_name:$license_count --wrap "$bin_sleep 300"
 	expect {
 		-re "Submitted batch job ($number)" {
 			set job_id $expect_out(1,string)
@@ -187,12 +185,6 @@ if {![string compare $select_type "linear"]} {
 	exit $exit_code
 }
 
-if {[test_select_type_params "MEMORY"]} {
-	set job_mem  10
-} else {
-	set job_mem  1
-}
-
 spawn $bin_id -un
 expect {
 	-re "($alpha_numeric_under)" {
@@ -378,7 +370,7 @@ exec $bin_cp $cwd/slurm.conf.orig $config_dir/slurm.conf
 reconfigure
 
 if {$exit_code == 0} {
-	exec $bin_rm -f $cwd/slurm.conf.orig $script_name
+	exec $bin_rm -f $cwd/slurm.conf.orig
 	send_user "\nSUCCESS\n"
 } else {
 	send_user "\nFAILURE\n"