From 6ab377807e0ce2e64197c829f9971c93ad0a22b5 Mon Sep 17 00:00:00 2001
From: Morris Jette <jette@schedmd.com>
Date: Mon, 11 Sep 2017 16:01:14 -0600
Subject: [PATCH] Remove redundant logic

---
 testsuite/expect/test38.1 | 3 ---
 testsuite/expect/test38.2 | 3 ---
 testsuite/expect/test38.3 | 3 ---
 testsuite/expect/test38.4 | 3 ---
 testsuite/expect/test38.5 | 3 ---
 5 files changed, 15 deletions(-)

diff --git a/testsuite/expect/test38.1 b/testsuite/expect/test38.1
index 4560b8b7137..f2c07b912fb 100755
--- a/testsuite/expect/test38.1
+++ b/testsuite/expect/test38.1
@@ -39,8 +39,6 @@ set exit_code    0
 set file_in      "test$test_id.in"
 set job_id       0
 
-set eol "\r\n"
-
 print_header $test_id
 
 proc sbatch {} {
@@ -83,7 +81,6 @@ proc cancel_all_jobs { } {
 
 	if {$job_id != 0} {
 		exec $scancel $job_id
-		sleep 5
 	}
 }
 
diff --git a/testsuite/expect/test38.2 b/testsuite/expect/test38.2
index a207ceabd29..037f136afdf 100755
--- a/testsuite/expect/test38.2
+++ b/testsuite/expect/test38.2
@@ -38,8 +38,6 @@ set exit_code    0
 set file_in      "test$test_id.in"
 set file_out     "test$test_id.out"
 
-set eol "\r\n"
-
 print_header $test_id
 
 proc sbatch {} {
@@ -102,7 +100,6 @@ proc cancel_all_jobs { } {
 
 	if {$job_id != 0} {
 		exec $scancel $job_id
-		sleep 5
 	}
 }
 
diff --git a/testsuite/expect/test38.3 b/testsuite/expect/test38.3
index bbe1a544bf2..d46372b713d 100755
--- a/testsuite/expect/test38.3
+++ b/testsuite/expect/test38.3
@@ -41,8 +41,6 @@ set exit_code    0
 set file_in      "test$test_id.in"
 set job_id       0
 
-set eol "\r\n"
-
 print_header $test_id
 
 proc salloc {} {
@@ -94,7 +92,6 @@ proc cancel_all_jobs { } {
 
 	if {$job_id != 0} {
 		exec $scancel $job_id
-		sleep 5
 	}
 }
 
diff --git a/testsuite/expect/test38.4 b/testsuite/expect/test38.4
index 2e4bd6a9dba..2112244564e 100755
--- a/testsuite/expect/test38.4
+++ b/testsuite/expect/test38.4
@@ -39,8 +39,6 @@ set test_id      "38.4"
 set exit_code    0
 set file_out     "test$test_id.out"
 
-set eol "\r\n"
-
 print_header $test_id
 
 proc salloc {} {
@@ -107,7 +105,6 @@ proc cancel_all_jobs { } {
 	global scancel job_id
 	if {$job_id != 0} {
 		exec $scancel $job_id
-		sleep 5
 	}
 }
 
diff --git a/testsuite/expect/test38.5 b/testsuite/expect/test38.5
index 4aa4f66e67f..6d121dd09fb 100755
--- a/testsuite/expect/test38.5
+++ b/testsuite/expect/test38.5
@@ -40,8 +40,6 @@ set file_in      "test$test_id.in"
 set file_out     "test$test_id.out"
 set job_id 0
 
-set eol "\r\n"
-
 print_header $test_id
 
 proc sbatch {} {
@@ -82,7 +80,6 @@ proc cancel_all_jobs { } {
 
 	if {$job_id != 0} {
 		exec $scancel $job_id
-		sleep 5
 	}
 }
 
-- 
GitLab