mirror of
https://github.com/curl/curl.git
synced 2026-04-27 00:12:14 +03:00
30ef79ed93
Require now pytest-xdist from tests/http/requirements.txt and run pytest in 'auto' parallel mode (counts cpu cores). For CI runs, set the worker count to 4, overriding the core count of 2 exposed in the images. - use Filelock to generate allocated ports at start for all workers and have subsequent workers just read the file and take the ports for their slot - make httpd config clearing a function fixture so every test starts with a clean httpd config - have fixture `configures_httpd` as parameter of test cases that configure httpd anyway, saving one reload - add pytest-xdist and filelock to required pyhton modules - add installs to ruff CI - give live checks waiting for a server to start up longer time - add fixtures to tests that rely on a server - do not stop servers unnecessarily. failures may not start them properly again, leading to unexpected fails in whatever follows - add a https: port to httpd that is *not* back by QUIC to allow failover tests without stopping the QUIC server Closes #17295
63 lines
2 KiB
Python
63 lines
2 KiB
Python
#!/usr/bin/env python3
|
|
# -*- coding: utf-8 -*-
|
|
#***************************************************************************
|
|
# _ _ ____ _
|
|
# Project ___| | | | _ \| |
|
|
# / __| | | | |_) | |
|
|
# | (__| |_| | _ <| |___
|
|
# \___|\___/|_| \_\_____|
|
|
#
|
|
# Copyright (C) Daniel Stenberg, <daniel@haxx.se>, et al.
|
|
#
|
|
# This software is licensed as described in the file COPYING, which
|
|
# you should have received as part of this distribution. The terms
|
|
# are also available at https://curl.se/docs/copyright.html.
|
|
#
|
|
# You may opt to use, copy, modify, merge, publish, distribute and/or sell
|
|
# copies of the Software, and permit persons to whom the Software is
|
|
# furnished to do so, under the terms of the COPYING file.
|
|
#
|
|
# This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
|
|
# KIND, either express or implied.
|
|
#
|
|
# SPDX-License-Identifier: curl
|
|
#
|
|
###########################################################################
|
|
#
|
|
import logging
|
|
import os
|
|
import socket
|
|
from collections.abc import Callable
|
|
from typing import Dict
|
|
|
|
from filelock import FileLock
|
|
|
|
log = logging.getLogger(__name__)
|
|
|
|
|
|
def alloc_port_set(port_specs: Dict[str, int]) -> Dict[str, int]:
|
|
socks = []
|
|
ports = {}
|
|
for name, ptype in port_specs.items():
|
|
try:
|
|
s = socket.socket(type=ptype)
|
|
s.bind(('', 0))
|
|
ports[name] = s.getsockname()[1]
|
|
socks.append(s)
|
|
except Exception as e:
|
|
raise e
|
|
for s in socks:
|
|
s.close()
|
|
return ports
|
|
|
|
|
|
def alloc_ports_and_do(port_spec: Dict[str, int],
|
|
do_func: Callable[[Dict[str, int]], bool],
|
|
gen_dir, max_tries=1) -> bool:
|
|
lock_file = os.path.join(gen_dir, 'ports.lock')
|
|
with FileLock(lock_file):
|
|
for _ in range(max_tries):
|
|
port_set = alloc_port_set(port_spec)
|
|
if do_func(port_set):
|
|
return True
|
|
return False
|