aboutsummaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorGravatar Yong Tang <yong.tang.github@outlook.com> 2020-09-24 11:30:39 -0700
committerGravatar GitHub <noreply@github.com> 2020-09-24 20:30:39 +0200
commit9798dd067f53a74e3777cff539b2f01617c107c6 (patch)
treefac3bbc495c9a7f78fd9a847fb44533bd6367d9a /test
parent279194f2e45c9dfeccafe95e515e0aced0ea8bdc (diff)
downloadcoredns-9798dd067f53a74e3777cff539b2f01617c107c6.tar.gz
coredns-9798dd067f53a74e3777cff539b2f01617c107c6.tar.zst
coredns-9798dd067f53a74e3777cff539b2f01617c107c6.zip
Cherry-pick: Implement notifies for transfer plugin (#3972) (#4142)
* Implement notifies for transfer plugin (#3972) * Fix notifies in transfer plugin Signed-off-by: Miek Gieben <miek@miek.nl> * Make it compile Signed-off-by: Miek Gieben <miek@miek.nl> * Port more plugins Signed-off-by: Miek Gieben <miek@miek.nl> * golint Signed-off-by: Miek Gieben <miek@miek.nl> * Fix tests Signed-off-by: Miek Gieben <miek@miek.nl> * Fix notifies in transfer plugin Signed-off-by: Miek Gieben <miek@miek.nl> * Make it compile Signed-off-by: Miek Gieben <miek@miek.nl> * Port more plugins Signed-off-by: Miek Gieben <miek@miek.nl> * golint Signed-off-by: Miek Gieben <miek@miek.nl> * Fix tests Signed-off-by: Miek Gieben <miek@miek.nl> * Fix tests Signed-off-by: Miek Gieben <miek@miek.nl> * really fix test Signed-off-by: Miek Gieben <miek@miek.nl> * Implement ixfr fallback and unify file and auto for transfering Signed-off-by: Miek Gieben <miek@miek.nl> * Add transfer tests copied and modified from #3452 Signed-off-by: Miek Gieben <miek@miek.nl> * Test correct selection of plugin Signed-off-by: Miek Gieben <miek@miek.nl> * add upstream back in Signed-off-by: Miek Gieben <miek@miek.nl> * Implement ixfr fallback and unify file and auto for transfering Signed-off-by: Miek Gieben <miek@miek.nl> * fix test Signed-off-by: Miek Gieben <miek@miek.nl> * properly merge Signed-off-by: Miek Gieben <miek@miek.nl> * Remove plugin/kubernetes/setup_transfer_test.go Signed-off-by: Yong Tang <yong.tang.github@outlook.com> Co-authored-by: Miek Gieben <miek@miek.nl>
Diffstat (limited to 'test')
-rw-r--r--test/auto_test.go4
-rw-r--r--test/file_upstream_test.go12
-rw-r--r--test/file_xfr_test.go5
-rw-r--r--test/secondary_test.go8
4 files changed, 15 insertions, 14 deletions
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 *
}
}`