diff --git a/testsuite/expect/test15.4 b/testsuite/expect/test15.4 index 784fafec96c1677a6c6dcfe6e4430c7baa415945..7baac57f89cbc3f2f8df57ab79c54631ec7214ab 100755 --- a/testsuite/expect/test15.4 +++ b/testsuite/expect/test15.4 @@ -81,18 +81,11 @@ expect { set job_id $expect_out(1,string) exp_continue } - -re "(uid=.*\n)" { + -re "(uid=.*\\)\r\n)" { set job_grp_info $expect_out(1,string) set got_job_grps 1 exp_continue } - - -re "salloc: Relinquishing job allocation" { - # this needs to be here so it doesn't get latched onto - # the previous check and mess the test up. - # This issue appears in later versions of expect. - exp_continue - } timeout { send_user "\nFAILURE: salloc not responding\n" if {$job_id != 0} { diff --git a/testsuite/expect/test3.2 b/testsuite/expect/test3.2 index b5b37826fcf516ded0101276e64e824fb8585745..4118cbdd4dc8e0ac4ceab3068ff5421e0b9921be 100755 --- a/testsuite/expect/test3.2 +++ b/testsuite/expect/test3.2 @@ -82,7 +82,7 @@ proc run_job { part_name } { # spawn $scontrol show part expect { - -re "PartitionName=($alpha_numeric_under) " { + -re "PartitionName=($alpha_numeric_under)" { if {[string compare $part_name ""] == 0} { set part_name $expect_out(1,string) }