[master] 05e795741 PRIV_TASK vtc: tolerate fini order
Nils Goroll
nils.goroll at uplex.de
Tue Jan 12 17:35:06 UTC 2021
commit 05e7957414467684db375ba6319f79a861a1b742
Author: Nils Goroll <nils.goroll at uplex.de>
Date: Tue Jan 12 18:26:41 2021 +0100
PRIV_TASK vtc: tolerate fini order
see previous, fix typo along the way
Ref d89c8bf59b9da8263f1a767c68e4ee35d2569d11
diff --git a/bin/varnishtest/tests/v00041.vtc b/bin/varnishtest/tests/v00041.vtc
index f3febd423..c4ec0123a 100644
--- a/bin/varnishtest/tests/v00041.vtc
+++ b/bin/varnishtest/tests/v00041.vtc
@@ -132,8 +132,8 @@ 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}
- expect 0 = Debug {^obj_priv_task_fini.*"r1002"}
+ 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 {^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"}
diff --git a/vmod/vmod_debug_obj.c b/vmod/vmod_debug_obj.c
index 45f0a9d04..d6db70ff4 100644
--- a/vmod/vmod_debug_obj.c
+++ b/vmod/vmod_debug_obj.c
@@ -161,7 +161,7 @@ obj_priv_task_fini(void *ptr)
static const struct vmod_priv_methods xyzzy_obj_test_priv_task_methods[1] = {{
.magic = VMOD_PRIV_METHODS_MAGIC,
- .type = "debug_onk_test_priv_task",
+ .type = "debug_obj_test_priv_task",
.fini = obj_priv_task_fini
}};
More information about the varnish-commit
mailing list