Attachment 14969 Details for Bug 13841 – selftest for this regression signed off by Garming Sam and myself

[patch] selftest for this regression signed off by Garming Sam and myself

0001-dlz-Add-test-to-ensure-there-are-writable-zones.patch (text/plain), 1.91 KB, created by Michael Saxl on 2019-03-21 09:53:35 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Michael Saxl

Created: 2019-03-21 09:53:35 UTC

Size: 1.91 KB

patch

obsolete

>From 52423de7f1cdd0b8ccf8d11c2f8feed23392c586 Mon Sep 17 00:00:00 2001
>From: Michael Saxl <mike@mwsys.mine.bz>
>Date: Thu, 21 Mar 2019 10:49:07 +0100
>Subject: [PATCH] dlz: Add test to ensure there are writable zones
>
>This is currently broken since 28e2a518ff32
>
>BUG: https://bugzilla.samba.org/show_bug.cgi?id=13841
>
>Signed-off-by: Garming Sam <garming@catalyst.net.nz>
>Signed-off-by: Michael Saxl <mike@mwsys.mine.bz>
>---
> selftest/knownfail.d/bind9-dlz  | 2 ++
> source4/torture/dns/dlz_bind9.c | 7 +++++++
> 2 files changed, 9 insertions(+)
> create mode 100644 selftest/knownfail.d/bind9-dlz
>
>diff --git a/selftest/knownfail.d/bind9-dlz b/selftest/knownfail.d/bind9-dlz
>new file mode 100644
>index 00000000000..84fc82f1f8b
>--- /dev/null
>+++ b/selftest/knownfail.d/bind9-dlz
>@@ -0,0 +1,2 @@
>+^samba4.dlz_bind9.configure.configure.*
>+^samba4.dlz_bind9.multipleconfigure.multipleconfigure.*
>diff --git a/source4/torture/dns/dlz_bind9.c b/source4/torture/dns/dlz_bind9.c
>index a627e2351f7..e5aec26e20a 100644
>--- a/source4/torture/dns/dlz_bind9.c
>+++ b/source4/torture/dns/dlz_bind9.c
>@@ -85,6 +85,8 @@ static bool test_dlz_bind9_create(struct torture_context *tctx)
> 	return true;
> }
> 
>+static bool calls_zone_hook = false;
>+
> static isc_result_t dlz_bind9_writeable_zone_hook(dns_view_t *view,
> 					   const char *zone_name)
> {
>@@ -119,6 +121,8 @@ static isc_result_t dlz_bind9_writeable_zone_hook(dns_view_t *view,
> 	}
> 	talloc_free(msg);
> 
>+	calls_zone_hook = true;
>+
> 	return ISC_R_SUCCESS;
> }
> 
>@@ -138,12 +142,15 @@ static bool test_dlz_bind9_configure(struct torture_context *tctx)
> 				 ISC_R_SUCCESS,
> 				 "Failed to create samba_dlz");
> 
>+	calls_zone_hook = false;
> 	torture_assert_int_equal(tctx, dlz_configure((void*)tctx, dbdata),
> 						     ISC_R_SUCCESS,
> 				 "Failed to configure samba_dlz");
> 
> 	dlz_destroy(dbdata);
> 
>+	torture_assert_int_equal(tctx, calls_zone_hook, 1, "Hasn't called zone hook");
>+
> 	return true;
> }
> 
>-- 
>2.19.1
>

Actions: View

Attachments on bug 13841: 14942 | 14950 | 14967 | 14969 | 14972 | 14973 | 14992