mirror of
https://github.com/isc-projects/bind9.git
synced 2026-02-28 20:41:18 -05:00
dbddc22187
The intended purpose of the @pytest.mark.requests decorator was to cause
Python-based parts of the "statschannel" system test to be skipped if
the requests Python module is not available. However, both
tests-json.py and tests-xml.py contain a global "import requests"
statement which triggers ImportError exceptions during test
initialization if the requests module is not available. In other words,
the @pytest.mark.requests decorator serves no useful purpose.
Since all tests in both tests-json.py and tests-xml.py depend on the
requests Python module, employ pytest.importorskip() to ensure the
Python-based parts of the "statschannel" system test are skipped when
the requests module is not available. Remove all occurrences of the
@pytest.mark.requests decorator (and all associated code) to prevent
confusion.
(cherry picked from commit 704ad2907f)
99 lines
2.9 KiB
Python
Executable file
99 lines
2.9 KiB
Python
Executable file
#!/usr/bin/python3
|
|
|
|
# Copyright (C) Internet Systems Consortium, Inc. ("ISC")
|
|
#
|
|
# SPDX-License-Identifier: MPL-2.0
|
|
#
|
|
# 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 https://mozilla.org/MPL/2.0/.
|
|
#
|
|
# See the COPYRIGHT file distributed with this work for additional
|
|
# information regarding copyright ownership.
|
|
|
|
from datetime import datetime
|
|
|
|
import os
|
|
|
|
import pytest
|
|
|
|
import generic
|
|
|
|
pytestmark = pytest.mark.skipif(not os.environ.get('HAVEJSONSTATS'),
|
|
reason='json-c support disabled in the build')
|
|
requests = pytest.importorskip('requests')
|
|
|
|
|
|
# JSON helper functions
|
|
def fetch_zones_json(statsip, statsport):
|
|
|
|
r = requests.get("http://{}:{}/json/v1/zones".format(statsip, statsport),
|
|
timeout=600)
|
|
assert r.status_code == 200
|
|
|
|
data = r.json()
|
|
return data["views"]["_default"]["zones"]
|
|
|
|
|
|
def fetch_traffic_json(statsip, statsport):
|
|
|
|
r = requests.get("http://{}:{}/json/v1/traffic".format(statsip, statsport),
|
|
timeout=600)
|
|
assert r.status_code == 200
|
|
|
|
data = r.json()
|
|
|
|
return data["traffic"]
|
|
|
|
|
|
def load_timers_json(zone, primary=True):
|
|
|
|
name = zone['name']
|
|
|
|
# Check if the primary zone timer exists
|
|
assert 'loaded' in zone
|
|
loaded = datetime.strptime(zone['loaded'], generic.fmt)
|
|
|
|
if primary:
|
|
# Check if the secondary zone timers does not exist
|
|
assert 'expires' not in zone
|
|
assert 'refresh' not in zone
|
|
expires = None
|
|
refresh = None
|
|
else:
|
|
assert 'expires' in zone
|
|
assert 'refresh' in zone
|
|
expires = datetime.strptime(zone['expires'], generic.fmt)
|
|
refresh = datetime.strptime(zone['refresh'], generic.fmt)
|
|
|
|
return (name, loaded, expires, refresh)
|
|
|
|
|
|
def load_zone_json(zone):
|
|
name = zone['name']
|
|
|
|
return name
|
|
|
|
|
|
def test_zone_timers_primary_json(statsport):
|
|
generic.test_zone_timers_primary(fetch_zones_json, load_timers_json,
|
|
statsip="10.53.0.1", statsport=statsport,
|
|
zonedir="ns1")
|
|
|
|
|
|
def test_zone_timers_secondary_json(statsport):
|
|
generic.test_zone_timers_secondary(fetch_zones_json, load_timers_json,
|
|
statsip="10.53.0.3", statsport=statsport,
|
|
zonedir="ns3")
|
|
|
|
|
|
def test_zone_with_many_keys_json(statsport):
|
|
generic.test_zone_with_many_keys(fetch_zones_json, load_zone_json,
|
|
statsip="10.53.0.2", statsport=statsport)
|
|
|
|
|
|
def test_traffic_json(named_port, statsport):
|
|
generic_dnspython = pytest.importorskip('generic_dnspython')
|
|
generic_dnspython.test_traffic(fetch_traffic_json,
|
|
statsip="10.53.0.2", statsport=statsport,
|
|
port=named_port)
|