From 68f1dd5ddf0451cc3a1b24a72c2965b8d896ffba Mon Sep 17 00:00:00 2001 From: Miek Gieben Date: Tue, 7 Jul 2020 21:38:07 +0200 Subject: Implement notifies for transfer plugin (#3972) * Fix notifies in transfer plugin Signed-off-by: Miek Gieben * Make it compile Signed-off-by: Miek Gieben * Port more plugins Signed-off-by: Miek Gieben * golint Signed-off-by: Miek Gieben * Fix tests Signed-off-by: Miek Gieben * Fix notifies in transfer plugin Signed-off-by: Miek Gieben * Make it compile Signed-off-by: Miek Gieben * Port more plugins Signed-off-by: Miek Gieben * golint Signed-off-by: Miek Gieben * Fix tests Signed-off-by: Miek Gieben * Fix tests Signed-off-by: Miek Gieben * really fix test Signed-off-by: Miek Gieben * Implement ixfr fallback and unify file and auto for transfering Signed-off-by: Miek Gieben * Add transfer tests copied and modified from #3452 Signed-off-by: Miek Gieben * Test correct selection of plugin Signed-off-by: Miek Gieben * add upstream back in Signed-off-by: Miek Gieben * Implement ixfr fallback and unify file and auto for transfering Signed-off-by: Miek Gieben * fix test Signed-off-by: Miek Gieben * properly merge Signed-off-by: Miek Gieben --- test/auto_test.go | 4 +++- test/file_upstream_test.go | 12 +++--------- test/file_xfr_test.go | 5 +++-- test/secondary_test.go | 8 ++++++-- 4 files changed, 15 insertions(+), 14 deletions(-) (limited to 'test') diff --git a/test/auto_test.go b/test/auto_test.go index f7e5faecd..3dd0fdf79 100644 --- a/test/auto_test.go +++ b/test/auto_test.go @@ -120,7 +120,9 @@ func TestAutoAXFR(t *testing.T) { auto { directory ` + tmpdir + ` db\.(.*) {1} reload 1s - transfer to * + } + transfer { + to * } }` diff --git a/test/file_upstream_test.go b/test/file_upstream_test.go index 9232b44a1..4d13a2ca0 100644 --- a/test/file_upstream_test.go +++ b/test/file_upstream_test.go @@ -29,9 +29,7 @@ www 3600 IN CNAME www.example.net. defer rm() corefile := `.:0 { - file ` + name + ` example.org { - upstream - } + file ` + name + ` example.org hosts { 10.0.0.1 www.example.net. fallthrough @@ -88,12 +86,8 @@ www 3600 IN A 127.0.0.53 defer rm2() corefile := `.:0 { - file ` + name + ` example.org { - upstream - } - file ` + name2 + ` foo.example.org { - upstream - } + file ` + name + ` example.org + file ` + name2 + ` foo.example.org }` i, udp, _, err := CoreDNSServerAndPorts(corefile) diff --git a/test/file_xfr_test.go b/test/file_xfr_test.go index b564417f0..0298f5e68 100644 --- a/test/file_xfr_test.go +++ b/test/file_xfr_test.go @@ -29,8 +29,9 @@ func TestLargeAXFR(t *testing.T) { defer rm() corefile := `example.com:0 { - file ` + name + ` { - transfer to * + file ` + name + ` + transfer { + to * } }` diff --git a/test/secondary_test.go b/test/secondary_test.go index bacc989b5..02fee0b3c 100644 --- a/test/secondary_test.go +++ b/test/secondary_test.go @@ -43,7 +43,9 @@ func TestSecondaryZoneTransfer(t *testing.T) { corefile := `example.org:0 { file ` + name + ` { - transfer to * + } + transfer { + to * } }` @@ -92,7 +94,9 @@ func TestIxfrResponse(t *testing.T) { corefile := `example.org:0 { file ` + name + ` { - transfer to * + } + transfer { + to * } }` -- cgit v1.2.3