From cb96ab9f4fe8e4c7a99cdd2a7f7af315f98231a9 Mon Sep 17 00:00:00 2001 From: Xiao An Date: Mon, 1 Apr 2019 14:28:01 +0800 Subject: Fully deprecate TIMEOUT and NO_RELOAD (#2742) * Fully deprecate NO_RELOAD Signed-off-by: Xiao An * Fully deprecate TIMEOUT Signed-off-by: Xiao An * Update CI tests to adapt to the deprecation of TIMEOUT Signed-off-by: Xiao An * Add documents for directive transfer in plugin auto Signed-off-by: Xiao An --- test/auto_test.go | 9 ++++++--- test/metrics_test.go | 3 ++- 2 files changed, 8 insertions(+), 4 deletions(-) (limited to 'test') diff --git a/test/auto_test.go b/test/auto_test.go index 9380ea78a..4d9b70a1c 100644 --- a/test/auto_test.go +++ b/test/auto_test.go @@ -19,7 +19,8 @@ func TestAuto(t *testing.T) { corefile := `org:0 { auto { - directory ` + tmpdir + ` db\.(.*) {1} 1 + directory ` + tmpdir + ` db\.(.*) {1} + reload 1s } } ` @@ -77,7 +78,8 @@ func TestAutoNonExistentZone(t *testing.T) { corefile := `.:0 { auto { - directory ` + tmpdir + ` (.*) {1} 1 + directory ` + tmpdir + ` (.*) {1} + reload 1s } errors stdout } @@ -115,7 +117,8 @@ func TestAutoAXFR(t *testing.T) { corefile := `org:0 { auto { - directory ` + tmpdir + ` db\.(.*) {1} 1 + directory ` + tmpdir + ` db\.(.*) {1} + reload 1s transfer to * } } diff --git a/test/metrics_test.go b/test/metrics_test.go index 4aaf89036..b84e906ce 100644 --- a/test/metrics_test.go +++ b/test/metrics_test.go @@ -77,7 +77,8 @@ func TestMetricsAuto(t *testing.T) { corefile := `org:0 { auto { - directory ` + tmpdir + ` db\.(.*) {1} 1 + directory ` + tmpdir + ` db\.(.*) {1} + reload 1s } prometheus localhost:0 } -- cgit v1.2.3