From 453abf39c04833c0e7d245c373f5074a66e0743e Mon Sep 17 00:00:00 2001
From: Morris Jette <jette@schedmd.com>
Date: Thu, 24 Sep 2015 11:36:10 -0700
Subject: [PATCH] Make tests a bit more robust
---
testsuite/expect/inc21.21_tests | 2 +-
testsuite/expect/test21.35 | 8 +++++---
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/testsuite/expect/inc21.21_tests b/testsuite/expect/inc21.21_tests
index b3b906ae28e..438067b4a5c 100644
--- a/testsuite/expect/inc21.21_tests
+++ b/testsuite/expect/inc21.21_tests
@@ -234,7 +234,7 @@ sleep 10"
if { $pending != 1 || $running != $val } {
send_user "\nFAILURE found $pending jobs pending "
- send_user "and $running jobs running"
+ send_user "and $running jobs running (want 1 and $val) "
print_err $test_type "inc21_21_grp_test"
set exit_code 1
}
diff --git a/testsuite/expect/test21.35 b/testsuite/expect/test21.35
index eaafd2ff987..d2be45a4846 100755
--- a/testsuite/expect/test21.35
+++ b/testsuite/expect/test21.35
@@ -122,6 +122,11 @@ proc check_limit { type name } {
set match 1
exp_continue
}
+ -re "Node count specification invalid" {
+ send_user "\nWARNING: Test exceeds available node count\n"
+ set match 1
+ exp_continue
+ }
-re "Submitted batch job ($number)" {
set job_id $expect_out(1,string)
set exit_code 1
@@ -142,9 +147,6 @@ proc check_limit { type name } {
exit 1
}
- # Cancel the submitted job
- cancel_job $job_id
-
# Reset limits
mod_qos $test_qos [array get reset_qos_val]
mod_acct $test_acct "" "" [array get reset_assoc_val]
--
GitLab