2020-04-14 17:02:21 +02:00
|
|
|
# Copyright (C) Internet Systems Consortium, Inc. ("ISC")
|
|
|
|
#
|
2021-06-03 08:37:05 +02:00
|
|
|
# SPDX-License-Identifier: MPL-2.0
|
|
|
|
#
|
2020-04-14 17:02:21 +02:00
|
|
|
# This Source Code Form is subject to the terms of the Mozilla Public
|
2021-06-03 08:37:05 +02:00
|
|
|
# License, v. 2.0. If a copy of the MPL was not distributed with this
|
2020-09-14 16:20:40 -07:00
|
|
|
# file, you can obtain one at https://mozilla.org/MPL/2.0/.
|
2020-04-14 17:02:21 +02:00
|
|
|
#
|
|
|
|
# See the COPYRIGHT file distributed with this work for additional
|
|
|
|
# information regarding copyright ownership.
|
|
|
|
|
Refactor "statschannel" test's helper modules
The "statschannel" system test contains two Python helper modules:
- generic.py: test functions directly invoked by both tests-json.py
and test-xml.py,
- helper.py: helper functions invoked by test functions in generic.py.
The above logic for splitting helper functions into Python modules
prevents selective test skipping from working due to unconditional
import statements being present in both helper modules. For example, if
dnspython is not available on the test host, tests-json.py imports
generic.py, which in turn imports helper.py, which in turn attempts to
import various dnspython modules, triggering ImportError exceptions
during test initialization. Various decorators used for some tests
(like @pytest.mark.dnspython) suggest that such a scenario should be
handled gracefully, but that is not the case - modifying the test
collection in conftest.py does not prevent pytest from failing due to
import errors.
Fix by moving helper functions around to achieve a different split:
- generic.py: helper functions only relying on the Python standard
library,
- generic_dnspython.py: helper functions requiring dnspython.
Only two tests in tests-{json,xml}.py need dnspython to work
(test_traffic_json(), test_traffic_xml()). Since all
dnspython-dependent code is now present in generic_dnspython.py, employ
pytest.importorskip() in those two tests to ensure they can be
selectively skipped when dnspython is not available. Adjust other code
to account for the revised Python helper module layout. Remove all
occurrences of the @pytest.mark.dnspython decorator (and all associated
code) from the "statschannel" system test to prevent confusion.
2022-03-14 08:59:32 +01:00
|
|
|
from datetime import datetime, timedelta
|
|
|
|
import os
|
|
|
|
|
|
|
|
|
|
|
|
# ISO datetime format without msec
|
2022-06-07 16:27:23 +02:00
|
|
|
fmt = "%Y-%m-%dT%H:%M:%SZ"
|
Refactor "statschannel" test's helper modules
The "statschannel" system test contains two Python helper modules:
- generic.py: test functions directly invoked by both tests-json.py
and test-xml.py,
- helper.py: helper functions invoked by test functions in generic.py.
The above logic for splitting helper functions into Python modules
prevents selective test skipping from working due to unconditional
import statements being present in both helper modules. For example, if
dnspython is not available on the test host, tests-json.py imports
generic.py, which in turn imports helper.py, which in turn attempts to
import various dnspython modules, triggering ImportError exceptions
during test initialization. Various decorators used for some tests
(like @pytest.mark.dnspython) suggest that such a scenario should be
handled gracefully, but that is not the case - modifying the test
collection in conftest.py does not prevent pytest from failing due to
import errors.
Fix by moving helper functions around to achieve a different split:
- generic.py: helper functions only relying on the Python standard
library,
- generic_dnspython.py: helper functions requiring dnspython.
Only two tests in tests-{json,xml}.py need dnspython to work
(test_traffic_json(), test_traffic_xml()). Since all
dnspython-dependent code is now present in generic_dnspython.py, employ
pytest.importorskip() in those two tests to ensure they can be
selectively skipped when dnspython is not available. Adjust other code
to account for the revised Python helper module layout. Remove all
occurrences of the @pytest.mark.dnspython decorator (and all associated
code) from the "statschannel" system test to prevent confusion.
2022-03-14 08:59:32 +01:00
|
|
|
|
|
|
|
# The constants were taken from BIND 9 source code (lib/dns/zone.c)
|
|
|
|
max_refresh = timedelta(seconds=2419200) # 4 weeks
|
|
|
|
max_expires = timedelta(seconds=14515200) # 24 weeks
|
|
|
|
now = datetime.utcnow().replace(microsecond=0)
|
|
|
|
dayzero = datetime.utcfromtimestamp(0).replace(microsecond=0)
|
|
|
|
|
|
|
|
|
|
|
|
# Generic helper functions
|
|
|
|
def check_expires(expires, min_time, max_time):
|
|
|
|
assert expires >= min_time
|
|
|
|
assert expires <= max_time
|
|
|
|
|
|
|
|
|
|
|
|
def check_refresh(refresh, min_time, max_time):
|
|
|
|
assert refresh >= min_time
|
|
|
|
assert refresh <= max_time
|
|
|
|
|
|
|
|
|
|
|
|
def check_loaded(loaded, expected):
|
|
|
|
# Sanity check the zone timers values
|
|
|
|
assert loaded == expected
|
|
|
|
assert loaded < now
|
|
|
|
|
|
|
|
|
|
|
|
def check_zone_timers(loaded, expires, refresh, loaded_exp):
|
|
|
|
# Sanity checks the zone timers values
|
|
|
|
if expires is not None:
|
|
|
|
check_expires(expires, now, now + max_expires)
|
|
|
|
if refresh is not None:
|
|
|
|
check_refresh(refresh, now, now + max_refresh)
|
|
|
|
check_loaded(loaded, loaded_exp)
|
|
|
|
|
|
|
|
|
|
|
|
#
|
|
|
|
# The output is gibberish, but at least make sure it does not crash.
|
|
|
|
#
|
|
|
|
def check_manykeys(name, zone=None):
|
|
|
|
# pylint: disable=unused-argument
|
|
|
|
assert name == "manykeys"
|
|
|
|
|
|
|
|
|
|
|
|
def zone_mtime(zonedir, name):
|
|
|
|
|
|
|
|
try:
|
|
|
|
si = os.stat(os.path.join(zonedir, "{}.db".format(name)))
|
|
|
|
except FileNotFoundError:
|
|
|
|
return dayzero
|
|
|
|
|
|
|
|
mtime = datetime.utcfromtimestamp(si.st_mtime).replace(microsecond=0)
|
|
|
|
|
|
|
|
return mtime
|
2020-04-14 17:02:21 +02:00
|
|
|
|
|
|
|
|
|
|
|
def test_zone_timers_primary(fetch_zones, load_timers, **kwargs):
|
|
|
|
|
2022-06-07 16:27:23 +02:00
|
|
|
statsip = kwargs["statsip"]
|
|
|
|
statsport = kwargs["statsport"]
|
|
|
|
zonedir = kwargs["zonedir"]
|
2020-04-14 17:02:21 +02:00
|
|
|
|
|
|
|
zones = fetch_zones(statsip, statsport)
|
|
|
|
|
|
|
|
for zone in zones:
|
|
|
|
(name, loaded, expires, refresh) = load_timers(zone, True)
|
Refactor "statschannel" test's helper modules
The "statschannel" system test contains two Python helper modules:
- generic.py: test functions directly invoked by both tests-json.py
and test-xml.py,
- helper.py: helper functions invoked by test functions in generic.py.
The above logic for splitting helper functions into Python modules
prevents selective test skipping from working due to unconditional
import statements being present in both helper modules. For example, if
dnspython is not available on the test host, tests-json.py imports
generic.py, which in turn imports helper.py, which in turn attempts to
import various dnspython modules, triggering ImportError exceptions
during test initialization. Various decorators used for some tests
(like @pytest.mark.dnspython) suggest that such a scenario should be
handled gracefully, but that is not the case - modifying the test
collection in conftest.py does not prevent pytest from failing due to
import errors.
Fix by moving helper functions around to achieve a different split:
- generic.py: helper functions only relying on the Python standard
library,
- generic_dnspython.py: helper functions requiring dnspython.
Only two tests in tests-{json,xml}.py need dnspython to work
(test_traffic_json(), test_traffic_xml()). Since all
dnspython-dependent code is now present in generic_dnspython.py, employ
pytest.importorskip() in those two tests to ensure they can be
selectively skipped when dnspython is not available. Adjust other code
to account for the revised Python helper module layout. Remove all
occurrences of the @pytest.mark.dnspython decorator (and all associated
code) from the "statschannel" system test to prevent confusion.
2022-03-14 08:59:32 +01:00
|
|
|
mtime = zone_mtime(zonedir, name)
|
|
|
|
check_zone_timers(loaded, expires, refresh, mtime)
|
2020-04-14 17:02:21 +02:00
|
|
|
|
|
|
|
|
|
|
|
def test_zone_timers_secondary(fetch_zones, load_timers, **kwargs):
|
|
|
|
|
2022-06-07 16:27:23 +02:00
|
|
|
statsip = kwargs["statsip"]
|
|
|
|
statsport = kwargs["statsport"]
|
|
|
|
zonedir = kwargs["zonedir"]
|
2020-04-14 17:02:21 +02:00
|
|
|
|
|
|
|
zones = fetch_zones(statsip, statsport)
|
|
|
|
|
|
|
|
for zone in zones:
|
|
|
|
(name, loaded, expires, refresh) = load_timers(zone, False)
|
Refactor "statschannel" test's helper modules
The "statschannel" system test contains two Python helper modules:
- generic.py: test functions directly invoked by both tests-json.py
and test-xml.py,
- helper.py: helper functions invoked by test functions in generic.py.
The above logic for splitting helper functions into Python modules
prevents selective test skipping from working due to unconditional
import statements being present in both helper modules. For example, if
dnspython is not available on the test host, tests-json.py imports
generic.py, which in turn imports helper.py, which in turn attempts to
import various dnspython modules, triggering ImportError exceptions
during test initialization. Various decorators used for some tests
(like @pytest.mark.dnspython) suggest that such a scenario should be
handled gracefully, but that is not the case - modifying the test
collection in conftest.py does not prevent pytest from failing due to
import errors.
Fix by moving helper functions around to achieve a different split:
- generic.py: helper functions only relying on the Python standard
library,
- generic_dnspython.py: helper functions requiring dnspython.
Only two tests in tests-{json,xml}.py need dnspython to work
(test_traffic_json(), test_traffic_xml()). Since all
dnspython-dependent code is now present in generic_dnspython.py, employ
pytest.importorskip() in those two tests to ensure they can be
selectively skipped when dnspython is not available. Adjust other code
to account for the revised Python helper module layout. Remove all
occurrences of the @pytest.mark.dnspython decorator (and all associated
code) from the "statschannel" system test to prevent confusion.
2022-03-14 08:59:32 +01:00
|
|
|
mtime = zone_mtime(zonedir, name)
|
|
|
|
check_zone_timers(loaded, expires, refresh, mtime)
|
2020-04-14 17:02:21 +02:00
|
|
|
|
|
|
|
|
|
|
|
def test_zone_with_many_keys(fetch_zones, load_zone, **kwargs):
|
|
|
|
|
2022-06-07 16:27:23 +02:00
|
|
|
statsip = kwargs["statsip"]
|
|
|
|
statsport = kwargs["statsport"]
|
2020-04-14 17:02:21 +02:00
|
|
|
|
|
|
|
zones = fetch_zones(statsip, statsport)
|
|
|
|
|
|
|
|
for zone in zones:
|
|
|
|
name = load_zone(zone)
|
2022-06-07 16:27:23 +02:00
|
|
|
if name == "manykeys":
|
Refactor "statschannel" test's helper modules
The "statschannel" system test contains two Python helper modules:
- generic.py: test functions directly invoked by both tests-json.py
and test-xml.py,
- helper.py: helper functions invoked by test functions in generic.py.
The above logic for splitting helper functions into Python modules
prevents selective test skipping from working due to unconditional
import statements being present in both helper modules. For example, if
dnspython is not available on the test host, tests-json.py imports
generic.py, which in turn imports helper.py, which in turn attempts to
import various dnspython modules, triggering ImportError exceptions
during test initialization. Various decorators used for some tests
(like @pytest.mark.dnspython) suggest that such a scenario should be
handled gracefully, but that is not the case - modifying the test
collection in conftest.py does not prevent pytest from failing due to
import errors.
Fix by moving helper functions around to achieve a different split:
- generic.py: helper functions only relying on the Python standard
library,
- generic_dnspython.py: helper functions requiring dnspython.
Only two tests in tests-{json,xml}.py need dnspython to work
(test_traffic_json(), test_traffic_xml()). Since all
dnspython-dependent code is now present in generic_dnspython.py, employ
pytest.importorskip() in those two tests to ensure they can be
selectively skipped when dnspython is not available. Adjust other code
to account for the revised Python helper module layout. Remove all
occurrences of the @pytest.mark.dnspython decorator (and all associated
code) from the "statschannel" system test to prevent confusion.
2022-03-14 08:59:32 +01:00
|
|
|
check_manykeys(name)
|