[master] 1ad4bb344 rework the logexpects of new b68.vtc

[Nils Goroll]

commit 1ad4bb344cc16f17e05a2d350834f5f202922b97
Author: Nils Goroll <nils.goroll at uplex.de>
Date:   Wed Apr 24 17:22:50 2019 +0200

    rework the logexpects of new b68.vtc
    
    Relying on fixed vxids was found to fail, sorry

diff --git a/bin/varnishtest/tests/b00068.vtc b/bin/varnishtest/tests/b00068.vtc
index afe44c5c4..e42b1a4e7 100644
--- a/bin/varnishtest/tests/b00068.vtc
+++ b/bin/varnishtest/tests/b00068.vtc
@@ -27,36 +27,22 @@ varnish v1 -arg "-p timeout_linger=1"	\
 	}
 } -start
 
-logexpect l1 -v v1 -q "vxid == 1001" {
-	expect * 1001 VCL_call {^RECV}
-	expect 0 1001 VCL_Log  "^0{128}$"
+logexpect l1 -v v1 -g session -q "SessOpen ~ a0" {
+	expect * * VCL_call {^RECV}
+	expect 0 = VCL_Log  "^0{128}$"
+	expect * * VCL_call {^RECV}
+	expect 0 = VCL_Log  "^0{128}$"
+	expect * * VCL_call {^RECV}
+	expect 0 = VCL_Log  "[1-9a-f]"
 } -start
 
-logexpect l2 -v v1 -q "vxid == 1004" {
-	expect * 1004 VCL_call {^RECV}
-	expect 0 1004 VCL_Log  "^0{128}$"
-} -start
-
-logexpect l3 -v v1 -q "vxid == 1005" {
-	expect * 1005 VCL_call {^RECV}
-	expect 0 1005 VCL_Log  "^0{128}$"
-} -start
-
-logexpect l4 -v v1 -q "vxid == 1006" {
-	expect * 1006 VCL_call {^RECV}
-	expect 0 1006 VCL_Log  "^0{128}$"
-} -start
-
-# requests which made a de-tour over the waiter
-
-logexpect l5 -v v1 -q "vxid == 1007" {
-	expect * 1007 VCL_call {^RECV}
-	expect 0 1007 VCL_Log  "[1-9a-f]"
-} -start
-
-logexpect l6 -v v1 -q "vxid == 1008" {
-	expect * 1008 VCL_call {^RECV}
-	expect 0 1008 VCL_Log  "[1-9a-f]"
+logexpect l2 -v v1 -g session -q "SessOpen ~ a1" {
+	expect * * VCL_call {^RECV}
+	expect 0 = VCL_Log  "^0{128}$"
+	expect * * VCL_call {^RECV}
+	expect 0 = VCL_Log  "^0{128}$"
+	expect * * VCL_call {^RECV}
+	expect 0 = VCL_Log  "[1-9a-f]"
 } -start
 
 client c1 {
@@ -86,7 +72,3 @@ client c1u -wait
 
 logexpect l1 -wait
 logexpect l2 -wait
-logexpect l3 -wait
-logexpect l4 -wait
-logexpect l5 -wait
-logexpect l6 -wait