From 806f8bf1d396a636cfdb2393e48d9ebde803bbeb Mon Sep 17 00:00:00 2001
From: Morris Jette <jette@schedmd.com>
Date: Thu, 3 Oct 2013 12:31:36 -0700
Subject: [PATCH] Change salloc job_allocate error message header
from "Failed to allocate resources" to
"Job submit/allocate failed"
---
src/salloc/salloc.c | 2 +-
testsuite/expect/test15.10 | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/salloc/salloc.c b/src/salloc/salloc.c
index 7659fb9ce38..3a576dce990 100644
--- a/src/salloc/salloc.c
+++ b/src/salloc/salloc.c
@@ -344,7 +344,7 @@ int main(int argc, char *argv[])
error("Unable to allocate resources: %m");
error_exit = immediate_exit;
} else {
- error("Failed to allocate resources: %m");
+ error("Job submit/allocate failed: %m");
}
slurm_allocation_msg_thr_destroy(msg_thr);
exit(error_exit);
diff --git a/testsuite/expect/test15.10 b/testsuite/expect/test15.10
index c4e4e7fc8a2..4c04eb2f08c 100755
--- a/testsuite/expect/test15.10
+++ b/testsuite/expect/test15.10
@@ -54,7 +54,7 @@ for {set inx 1} {$inx < 4} {set inx [expr $inx * 2]} {
send "exit\r"
exp_continue
}
- -re "Failed to allocate.*" {
+ -re "allocate failed" {
send_user "\nThis error is not unexpected, no worries\n"
set tasks_get $tasks_set
}
--
GitLab