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 --- plugin/pkg/parse/parse_test.go | 45 +++++++----------------------------------- 1 file changed, 7 insertions(+), 38 deletions(-) (limited to 'plugin/pkg/parse/parse_test.go') diff --git a/plugin/pkg/parse/parse_test.go b/plugin/pkg/parse/parse_test.go index a9f947a7d..b1a9f0282 100644 --- a/plugin/pkg/parse/parse_test.go +++ b/plugin/pkg/parse/parse_test.go @@ -6,65 +6,41 @@ import ( "github.com/caddyserver/caddy" ) -func TestTransfer(t *testing.T) { +func TestTransferIn(t *testing.T) { tests := []struct { inputFileRules string shouldErr bool - secondary bool - expectedTo []string expectedFrom []string }{ - // OK transfer to - { - `to 127.0.0.1`, - false, false, []string{"127.0.0.1:53"}, []string{}, - }, - // OK transfer tos - { - `to 127.0.0.1 127.0.0.2`, - false, false, []string{"127.0.0.1:53", "127.0.0.2:53"}, []string{}, - }, - // OK transfer from { `from 127.0.0.1`, - false, true, []string{}, []string{"127.0.0.1:53"}, + false, []string{"127.0.0.1:53"}, }, // OK transfer froms { `from 127.0.0.1 127.0.0.2`, - false, true, []string{}, []string{"127.0.0.1:53", "127.0.0.2:53"}, - }, - // OK transfer tos/froms - { - `to 127.0.0.1 127.0.0.2 - from 127.0.0.1 127.0.0.2`, - false, true, []string{"127.0.0.1:53", "127.0.0.2:53"}, []string{"127.0.0.1:53", "127.0.0.2:53"}, - }, - // Bad transfer from, secondary false - { - `from 127.0.0.1`, - true, false, []string{}, []string{}, + false, []string{"127.0.0.1:53", "127.0.0.2:53"}, }, // Bad transfer from garbage { `from !@#$%^&*()`, - true, true, []string{}, []string{}, + true, []string{}, }, // Bad transfer from no args { `from`, - true, false, []string{}, []string{}, + true, []string{}, }, // Bad transfer from * { `from *`, - true, true, []string{}, []string{}, + true, []string{}, }, } for i, test := range tests { c := caddy.NewTestController("dns", test.inputFileRules) - tos, froms, err := Transfer(c, test.secondary) + froms, err := TransferIn(c) if err == nil && test.shouldErr { t.Fatalf("Test %d expected errors, but got no error %+v %+v", i, err, test) @@ -72,13 +48,6 @@ func TestTransfer(t *testing.T) { t.Fatalf("Test %d expected no errors, but got '%v'", i, err) } - if test.expectedTo != nil { - for j, got := range tos { - if got != test.expectedTo[j] { - t.Fatalf("Test %d expected %v, got %v", i, test.expectedTo[j], got) - } - } - } if test.expectedFrom != nil { for j, got := range froms { if got != test.expectedFrom[j] { -- cgit v1.2.3