diff options
| author |  Yong Tang <yong.tang.github@outlook.com>
| 2020-09-24 11:30:39 -0700 |
|---|---|---|
| committer |  GitHub <noreply@github.com>
| 2020-09-24 20:30:39 +0200 |
| commit | 9798dd067f53a74e3777cff539b2f01617c107c6 (patch) | |
| tree | fac3bbc495c9a7f78fd9a847fb44533bd6367d9a /plugin/pkg/parse/parse_test.go | |
| parent | 279194f2e45c9dfeccafe95e515e0aced0ea8bdc (diff) | |
| download | coredns-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 'plugin/pkg/parse/parse_test.go')
| -rw-r--r-- | plugin/pkg/parse/parse_test.go | 45 |
1 files changed, 7 insertions, 38 deletions
diff --git a/plugin/pkg/parse/parse_test.go b/plugin/pkg/parse/parse_test.go index e0f817f49..b0ab2c601 100644 --- a/plugin/pkg/parse/parse_test.go +++ b/plugin/pkg/parse/parse_test.go @@ -6,65 +6,41 @@ import ( "github.com/coredns/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] { |