Skip to content
Snippets Groups Projects
Commit 32be96e5 authored by Brian Christiansen's avatar Brian Christiansen
Browse files

Update test regexes

was matching more than expected.
parent 8d55b093
No related branches found
No related tags found
No related merge requests found
......@@ -125,7 +125,7 @@ proc sbatch { args } {
--error=/dev/null -t300 --requeue "
append command $args
append command " $file_in"
set regex "Submitted batch job ($number).+"
set regex "Submitted batch job ($number)"
spawn {*}$command
expect {
......
......@@ -88,7 +88,7 @@ proc sbatch { args } {
--error=/dev/null --cluster-constraint="
append command $args
append command " $file_in"
set regex "Submitted batch job ($number).+"
set regex "Submitted batch job ($number)"
spawn {*}$command
expect {
......
......@@ -324,7 +324,7 @@ cancel_all_jobs
set feds [list $fedc1 $fedc2 $fedc3]
set regex [build_regex $feds]
set reg_default "Submitted batch job ($number).+"
set reg_default "Submitted batch job ($number)"
sbatch_to "--test-only" $regex
......
......@@ -82,7 +82,7 @@ proc sbatch { options regex } {
append command " --wrap \"sleep 20\""
if {[string match $regex ""]} {
set capture 1
set regex "Submitted batch job ($number).+"
set regex "Submitted batch job ($number)"
}
spawn {*}$command
expect {
......
......@@ -114,7 +114,7 @@ proc sbatch { options } {
set command "$my_sbatch -N$node_count --exclusive "
append command $options
append command " --wrap \"sleep 900\""
set regex "Submitted batch job ($number).+"
set regex "Submitted batch job ($number)"
spawn {*}$command
expect {
-re "$regex" {
......
......@@ -81,7 +81,7 @@ proc sbatch { options } {
set command "$my_sbatch -N10 --exclusive -o/dev/null "
append command $options
append command " --wrap \"sleep 300\""
set regex "Submitted batch job ($number).+"
set regex "Submitted batch job ($number)"
spawn {*}$command
expect {
-re "$regex" {
......
......@@ -215,7 +215,7 @@ proc sbatch { options } {
set command "$my_sbatch -N10 --exclusive -o/dev/null "
append command $options
append command " --wrap \"sleep 300\""
set regex "Submitted batch job ($number).+"
set regex "Submitted batch job ($number)"
spawn {*}$command
expect {
-re "$regex" {
......
......@@ -175,7 +175,7 @@ proc sbatch { mfed error } {
set job_id 0
set command "$my_sbatch -N$node_count --exclusive --output=/dev/null \
--error=/dev/null -t300 --requeue --wrap $script"
set regex "Submitted batch job ($number).+"
set regex "Submitted batch job ($number)"
set collect 1
if { $error } {
......
......@@ -119,7 +119,7 @@ proc sbatch { } {
set command "$my_sbatch -N$node_count --exclusive --output=/dev/null \
--error=/dev/null -t300 --requeue --wrap $script \
-Mfed1,fed2,fed3"
set regex "Submitted batch job ($number).+"
set regex "Submitted batch job ($number)"
set collect 1
spawn {*}$command
......
......@@ -87,7 +87,7 @@ proc sbatch { args } {
--error=/dev/null -t300 --requeue "
append command $args
append command " $file_in"
set regex "Submitted batch job ($number).+"
set regex "Submitted batch job ($number)"
spawn {*}$command
expect {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment