[master] 3e17b28a7 Stabilize r1804

[Dridi Boukelmoune]

commit 3e17b28a794367e1352bfddf2d15460091b76590
Author: Dridi Boukelmoune <dridi.boukelmoune at gmail.com>
Date:   Mon Dec 30 13:16:07 2019 +0100

    Stabilize r1804
    
    It was a bit racy in the sense that the logs for c2 could be committed
    before the c1 logs. I hardened the expectations a bit in the process.

diff --git a/bin/varnishtest/tests/r01804.vtc b/bin/varnishtest/tests/r01804.vtc
index 983091d88..7fcbaa1e6 100644
--- a/bin/varnishtest/tests/r01804.vtc
+++ b/bin/varnishtest/tests/r01804.vtc
@@ -6,18 +6,15 @@ server s1 {
 } -start
 
 
-varnish v1 -arg "-afoo=127.0.0.1:0,PROXY" -vcl+backend {
-} -start
+varnish v1 -arg "-a foo=127.0.0.1:0,PROXY"
+varnish v1 -arg "-p thread_pools=1"
+varnish v1 -vcl+backend "" -start
 
-logexpect l1 -v v1 -d 0 -g session {
-	expect * *	Begin	{^sess .* PROXY$}
-	expect * =	SessOpen	{^.* foo .*}
-	expect * =	Proxy	{^1 }
-	expect * *	Begin	{^req}
-	expect * *	Begin	{^sess .* PROXY$}
-	expect * =	SessOpen	{^.* foo .*}
-	expect * =	Proxy	{^2 }
-	expect * *	Begin	{^req}
+logexpect l1 -v v1 -g session {
+	expect * 1000	Begin		{^sess .* PROXY$}
+	expect 0 =	SessOpen	{^.* foo .*}
+	expect 0 =	Proxy		{^1 }
+	expect * 1001	Begin		{^req}
 } -start
 
 client c1 {
@@ -26,6 +23,15 @@ client c1 {
 	rxresp
 } -run
 
+logexpect l1 -wait
+
+logexpect l2 -v v1 -g session {
+	expect * 1003	Begin		{^sess .* PROXY$}
+	expect 0 =	SessOpen	{^.* foo .*}
+	expect 0 =	Proxy		{^2 }
+	expect * 1004	Begin		{^req}
+} -start
+
 client c2 {
 	# good IPv4
 	sendhex "0d 0a 0d 0a 00 0d 0a 51 55 49 54 0a"
@@ -38,4 +44,4 @@ client c2 {
 	rxresp
 } -run
 
-logexpect l1 -wait
+logexpect l2 -wait