(client_good_bad_expect): New proc.

(client_extracting_expect): New proc.

src/server/testsuite/config/unix.exp

@@ -342,6 +342,18 @@ proc client_expect {nr regex} {
     talk_to $oldwhat $oldnr
 }
 
+proc client_good_bad_expect {nr good_regex bad_regex {xreason ""}} {
+    global current_talk_what
+    global current_talk_nr
+
+    set oldwhat $current_talk_what
+    set oldnr $current_talk_nr
+
+    talk_to client $nr
+    good_bad_expect "$good_regex" "$bad_regex" "$xreason"
+    talk_to $oldwhat $oldnr
+}
+
 proc good_bad_expect {good_regex bad_regex {xreason ""}} {
     global test
     global any
@@ -390,6 +402,19 @@ proc good_bad_expect {good_regex bad_regex {xreason ""}} {
     unset test
 }
 
+proc client_extracting_expect {nr regex var grp} {
+    global current_talk_what
+    global current_talk_nr
+
+    set oldwhat $current_talk_what
+    set oldnr $current_talk_nr
+
+    talk_to client $nr
+    extracting_expect "$regex" $var $grp
+    talk_to $oldwhat $oldnr
+}
+
+
 proc extracting_expect {regex var grp} {
     global test
     global any