[master] 1c4506bd9 vtc: Polish r3159

[Dridi Boukelmoune]

commit 1c4506bd970d2842314a4adae4e3e13f708dc308
Author: Dridi Boukelmoune <dridi.boukelmoune at gmail.com>
Date:   Thu Jun 29 10:47:00 2023 +0200

    vtc: Polish r3159
    
    For both processes, dump the screen before checking expectations. For
    p1, we make sure we have something to show before proceeding, and can
    abuse CLI serialization for that. Since p2 was already waited for, the
    screen dump was already guaranteed to succeed, on the other hand the
    superfluous p2 -wait can go away.

diff --git a/bin/varnishtest/tests/r03159.vtc b/bin/varnishtest/tests/r03159.vtc
index b95abf320..d165d4c2d 100644
--- a/bin/varnishtest/tests/r03159.vtc
+++ b/bin/varnishtest/tests/r03159.vtc
@@ -14,10 +14,14 @@ process p1 -log {
 	    -l 2m 2>&1
 } -start -expect-exit 0x40
 
-process p1 -expect-text 0 1 "Unused sub foo, defined:"
-process p1 -expect-text 0 1 "(That was just a warning)"
+shell {
+	# wait for startup vcl.load to complete
+	varnishadm -n ${tmpdir}/t ping
+}
 
 process p1 -screen_dump
+process p1 -expect-text 0 1 "Unused sub foo, defined:"
+process p1 -expect-text 0 1 "(That was just a warning)"
 
 process p2 -log {
 	set -e
@@ -26,12 +30,8 @@ process p2 -log {
 	varnishadm -n ${tmpdir}/t "vcl.list"
 } -run
 
-process p2 -wait
-process p1 -kill TERM
-
 process p2 -screen_dump
-
 process p2 -expect-text 0 1 "Unused sub foo, defined:"
 process p2 -expect-text 0 1 "(That was just a warning)"
 
-process p1 -wait
+process p1 -kill TERM