From 455283c20d6f4d03ff5989ec6d17eec08e89d766 Mon Sep 17 00:00:00 2001
From: Morris Jette <jette@schedmd.com>
Date: Wed, 21 Mar 2012 11:03:23 -0700
Subject: [PATCH] Minor test mods for old RedHat distro
---
testsuite/expect/test14.7 | 20 ++++----------------
testsuite/expect/test23.2 | 2 +-
2 files changed, 5 insertions(+), 17 deletions(-)
diff --git a/testsuite/expect/test14.7 b/testsuite/expect/test14.7
index 4299069d049..e385d78481a 100755
--- a/testsuite/expect/test14.7
+++ b/testsuite/expect/test14.7
@@ -111,34 +111,22 @@ set matches 0
if {[wait_for_file $file_err] == 0} {
spawn $bin_cat $file_err
expect {
- -re "REQUEST_FILE_BCAST.* Permission denied" {
+ -re "error: REQUEST_FILE_BCAST" {
send_user "These errors are expected, no worries\n"
incr matches
exp_continue
}
- -re "REQUEST_FILE_BCAST.* Operation not permitted" {
-# variation on Permission denied if initgroups() fails
-# due to not running slurmd as root
+ -re "ls.* No such file" {
send_user "These errors are expected, no worries\n"
incr matches
exp_continue
}
- -re "REQUEST_FILE_BCAST.* File exists" {
- send_user "Vestigial file should be removed\n"
- incr matches
- exp_continue
- }
- -re "No such file" {
- send_user "These errors are expected, no worries\n"
- incr matches
- exp_continue
- }
- -re "does not exist" {
+ -re "ls.* does not exist" {
send_user "These errors are expected, no worries\n"
incr matches
exp_continue
}
- -re "not found" {
+ -re "ls.* not found" {
send_user "These errors are expected, no worries\n"
incr matches
exp_continue
diff --git a/testsuite/expect/test23.2 b/testsuite/expect/test23.2
index 67bf0a4975f..bdd94c9d039 100755
--- a/testsuite/expect/test23.2
+++ b/testsuite/expect/test23.2
@@ -189,7 +189,7 @@ $srun sleep 10
# Spawn a job via srun using this account
#
set job_id3 0
-spawn $sbatch -N1 -v --account=$test_acct $file_in1
+spawn $sbatch -N1 -t1 -v --account=$test_acct $file_in1
expect {
-re "Submitted batch job ($number)" {
set job_id3 $expect_out(1,string)
--
GitLab