mirror of
https://github.com/isc-projects/bind9.git
synced 2026-03-18 00:26:11 -04:00
704ad2907f
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.
25 lines
669 B
Python
25 lines
669 B
Python
# 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.
|
|
|
|
import os
|
|
import pytest
|
|
|
|
|
|
@pytest.fixture
|
|
def statsport(request):
|
|
# pylint: disable=unused-argument
|
|
env_port = os.getenv("EXTRAPORT1")
|
|
if env_port is None:
|
|
env_port = 5301
|
|
else:
|
|
env_port = int(env_port)
|
|
|
|
return env_port
|