[master] e7449d3b9 Revert "PRIV_TASK vtc: tolerate fini order"
Nils Goroll
nils.goroll at uplex.de
Tue Jan 12 22:11:12 UTC 2021
commit e7449d3b9ea32445bc2d8763533683b6bca77a87
Author: Nils Goroll <nils.goroll at uplex.de>
Date: Tue Jan 12 22:04:35 2021 +0100
Revert "PRIV_TASK vtc: tolerate fini order"
These efforts lead nowhere. The problem needed to be solved at the root.
This reverts commit 05e7957414467684db375ba6319f79a861a1b742.
This reverts commit b02c78438c4e36d967a866466c9ce0cccb32dc0f.
diff --git a/bin/varnishtest/tests/r02451.vtc b/bin/varnishtest/tests/r02451.vtc
index b25163a65..39cf67aa2 100644
--- a/bin/varnishtest/tests/r02451.vtc
+++ b/bin/varnishtest/tests/r02451.vtc
@@ -53,10 +53,9 @@ logexpect l1 -v v1 -g raw -d 1 {
expect 0 * VCL_Log {^func something to remember}
expect 0 * Debug {^objx.priv_task.*"something to remember".$}
expect 0 * VCL_Log {^obj something to remember}
- # string stored in obj priv_task can already been freed,
- # depending on the order
- expect 0 * Debug {^priv_task_free|^obj_priv_task_fini}
- expect 0 * Debug {^priv_task_free|^obj_priv_task_fini}
+ expect 0 * Debug {^priv_task_free}
+ # string stored in obj priv_task has already been freed
+ expect 0 * Debug {^obj_priv_task_fini}
expect 0 * Debug {^vcl1: VCL_EVENT_WARM}
} -start
diff --git a/bin/varnishtest/tests/v00041.vtc b/bin/varnishtest/tests/v00041.vtc
index c4ec0123a..55415bd1d 100644
--- a/bin/varnishtest/tests/v00041.vtc
+++ b/bin/varnishtest/tests/v00041.vtc
@@ -120,9 +120,9 @@ logexpect l0 -v v1 -g raw -d 1 -q "vxid == 0 and not ExpKill" {
expect 0 = VCL_Log {^objc initX}
expect 0 = Debug {^objb.priv_task.. = .*"initY"}
expect 0 = VCL_Log {^objb initY}
- expect 0 = Debug {^priv_task_free|^obj_priv_task_fini}
- expect 0 = Debug {^priv_task_free|^obj_priv_task_fini}
- expect 0 = Debug {^priv_task_free|^obj_priv_task_fini}
+ expect 0 = Debug {^priv_task_free}
+ expect 0 = Debug {^obj_priv_task_fini.*"initX"}
+ expect 0 = Debug {^obj_priv_task_fini.*"initY"}
expect 0 = Debug {^vcl1: VCL_EVENT_WARM}
# 1001/1002
@@ -132,11 +132,11 @@ logexpect l0 -v v1 -g raw -d 1 -q "vxid == 0 and not ExpKill" {
expect 0 = Debug {^test_priv_task.*new.$}
expect 0 = Debug {^test_priv_task.*update.$}
expect 0 = Debug {^test_priv_task.*exists.$}
- expect 0 = Debug {^priv_task_free|^obj_priv_task_fini.*"r1002"}
- expect 0 = Debug {^priv_task_free|^obj_priv_task_fini.*"r1002"}
+ expect 0 = Debug {^priv_task_free}
+ expect 0 = Debug {^obj_priv_task_fini.*"r1002"}
expect 0 = Debug {^test_priv_task.*exists}
- expect 0 = Debug {^priv_task_free|^obj_priv_task_fini.*"d1001"}
- expect 0 = Debug {^priv_task_free|^obj_priv_task_fini.*"d1001"}
+ expect 0 = Debug {^priv_task_free}
+ expect 0 = Debug {^obj_priv_task_fini.*"d1001"}
# ...
# 1006 pipe
More information about the varnish-commit
mailing list