diff options
| author |  Miek Gieben <miek@miek.nl>
| 2019-08-01 12:51:37 +0000 |
|---|---|---|
| committer |  Yong Tang <yong.tang.github@outlook.com>
| 2019-08-01 05:51:37 -0700 |
| commit | a01b202b6ace52148dcfdfe8bc723878e0f911f8 (patch) | |
| tree | c885cccb1756301238543eeb1bfd046db2d2902a /test | |
| parent | 3219a2b93a8010af9b5c2263c658815a4494416e (diff) | |
| download | coredns-a01b202b6ace52148dcfdfe8bc723878e0f911f8.tar.gz coredns-a01b202b6ace52148dcfdfe8bc723878e0f911f8.tar.zst coredns-a01b202b6ace52148dcfdfe8bc723878e0f911f8.zip | |
Fixes races in test and klog (#3079)
Various fixes to make things less flaky:
* kubernetes: put klog.SetOutput in the setup function, not in the init
function to see if that helps
* file: make z.Expired a boolean instead of a pointer to a boolean
* test: fix TestSecondaryZoneTransfer test, which wasn't actually
testing in the right way. It's more right now, but may still be racy
(race introduced because a file's lazy loading of zones)
Signed-off-by: Miek Gieben <miek@miek.nl>
Diffstat (limited to 'test')
| -rw-r--r-- | test/secondary_test.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/test/secondary_test.go b/test/secondary_test.go index bfa1da05b..c0df1632b 100644 --- a/test/secondary_test.go +++ b/test/secondary_test.go @@ -73,13 +73,13 @@ func TestSecondaryZoneTransfer(t *testing.T) { var r *dns.Msg // This is now async; we we need to wait for it to be transferred. for i := 0; i < 10; i++ { - r, _ = dns.Exchange(m, udp) - if len(r.Answer) == 0 { + r, err = dns.Exchange(m, udp) + if len(r.Answer) != 0 { break } time.Sleep(100 * time.Microsecond) } - if len(r.Answer) != 0 { + if len(r.Answer) == 0 { t.Fatalf("Expected answer section") } } |