From cf9c2ef3053c382768a6a4a6eab28eb29c9d60cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Sur=C3=BD?= Date: Mon, 12 Nov 2018 14:55:57 +0100 Subject: [PATCH] Fix the max-ncache-ttl tests --- ...axncachettl.conf => bad-maxncachettl-1.conf} | 0 .../system/checkconf/bad-maxncachettl-2.conf | 14 ++++++++++++++ .../system/checkconf/bad-maxncachettl-3.conf | 17 +++++++++++++++++ .../system/checkconf/bad-maxncachettl-4.conf | 14 ++++++++++++++ .../system/checkconf/good-maxncachettl.conf | 2 +- 5 files changed, 46 insertions(+), 1 deletion(-) rename bin/tests/system/checkconf/{bad-maxncachettl.conf => bad-maxncachettl-1.conf} (100%) create mode 100644 bin/tests/system/checkconf/bad-maxncachettl-2.conf create mode 100644 bin/tests/system/checkconf/bad-maxncachettl-3.conf create mode 100644 bin/tests/system/checkconf/bad-maxncachettl-4.conf 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 index 0000000000..e8eae8f186 --- /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 index 0000000000..f31c133e26 --- /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 index 0000000000..c220ecd7b3 --- /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 227da86c34..198f3bd568 100644 --- 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;