Fix the max-ncache-ttl tests

diff --git a/bin/tests/system/checkconf/bad-maxncachettl.conf b/bin/tests/system/checkconf/bad-maxncachettl-1.conf
similarity index 100%
rename from bin/tests/system/checkconf/bad-maxncachettl.conf
rename to bin/tests/system/checkconf/bad-maxncachettl-1.conf

diff --git a/bin/tests/system/checkconf/bad-maxncachettl-2.conf b/bin/tests/system/checkconf/bad-maxncachettl-2.conf
new file mode 100644 (file)
index 0000000..e8eae8f
--- /dev/null
+++ b/bin/tests/system/checkconf/bad-maxncachettl-2.conf
@@ -0,0 +1,14 @@
+/*
+ * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * See the COPYRIGHT file distributed with this work for additional
+ * information regarding copyright ownership.
+ */
+
+view two {
+       max-ncache-ttl 604801;
+};

diff --git a/bin/tests/system/checkconf/bad-maxncachettl-3.conf b/bin/tests/system/checkconf/bad-maxncachettl-3.conf
new file mode 100644 (file)
index 0000000..f31c133
--- /dev/null
+++ b/bin/tests/system/checkconf/bad-maxncachettl-3.conf
@@ -0,0 +1,17 @@
+/*
+ * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * See the COPYRIGHT file distributed with this work for additional
+ * information regarding copyright ownership.
+ */
+
+view three {
+       max-ncache-ttl 4000000000;
+};
+view four {
+       max-ncache-ttl -1;
+};

diff --git a/bin/tests/system/checkconf/bad-maxncachettl-4.conf b/bin/tests/system/checkconf/bad-maxncachettl-4.conf
new file mode 100644 (file)
index 0000000..c220ecd
--- /dev/null
+++ b/bin/tests/system/checkconf/bad-maxncachettl-4.conf
@@ -0,0 +1,14 @@
+/*
+ * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * See the COPYRIGHT file distributed with this work for additional
+ * information regarding copyright ownership.
+ */
+
+view four {
+       max-ncache-ttl -1;
+};

diff --git a/bin/tests/system/checkconf/good-maxncachettl.conf b/bin/tests/system/checkconf/good-maxncachettl.conf
index 227da86c34a2f898e6811a23c7bdcdc39804c532..198f3bd5687b108042210229e09fa797ddd829d9 100644 (file)
--- a/bin/tests/system/checkconf/good-maxncachettl.conf
+++ b/bin/tests/system/checkconf/good-maxncachettl.conf
@@ -16,7 +16,7 @@ view two {
        max-ncache-ttl 86400;
 };
 view three {
-       max-ncache-ttl 4000000000;
+       max-ncache-ttl 604800;
 };
 view four {
        max-ncache-ttl 3600s;