saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Minor cleanup

Browse source 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
This commit is contained in:
Pedro Algarvio 2024-01-24 15:15:33 +00:00
parent 86cfde38ed
commit 121301514d
No known key found for this signature in database
GPG key ID: BB36BF6584A298FF
1 changed files with 6 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
tests/pytests/functional/utils/test_http.py
View file

@ -3,17 +3,16 @@ import ssl
import tarfile
import pytest
try:
import trustme
except ImportError:
pass
from pytestshellutils.utils import ports
from saltfactories.utils import random_string
import salt.utils.http
pytestmark = [
pytest.mark.slow_test,
pytest.mark.skip_if_binaries_missing("docker", "dockerd", check_all=False),
]
@pytest.mark.parametrize("backend", ["requests", "urllib2", "tornado"])
def test_decode_body(webserver, integration_files_dir, backend):
@ -26,12 +25,6 @@ def test_decode_body(webserver, integration_files_dir, backend):
assert isinstance(ret["body"], bytes)
pytestmark = [
pytest.mark.slow_test,
pytest.mark.skip_if_binaries_missing("docker", "dockerd", check_all=False),
]
@pytest.fixture(scope="module")
def tinyproxy_port():
return ports.get_unused_localhost_port()
@ -49,6 +42,7 @@ def tinyproxy_pass():
@pytest.fixture(scope="session")
def ca():
trustme = pytest.importorskip("trustme")
return trustme.CA()