diff --git a/locust/stats.py b/locust/stats.py index 06583c6f40..b52d9a33bc 100644 --- a/locust/stats.py +++ b/locust/stats.py @@ -880,7 +880,7 @@ def stats_history(runner: "Runner") -> None: break if runner.state != "stopped": r = { - "time": datetime.datetime.utcnow().strftime("%H:%M:%S"), + "time": datetime.datetime.now(tz=datetime.timezone.utc).strftime("%H:%M:%S"), "current_rps": stats.total.current_rps or 0, "current_fail_per_sec": stats.total.current_fail_per_sec or 0, "response_time_percentile_95": stats.total.get_current_response_time_percentile(0.95) or 0, diff --git a/locust/test/util.py b/locust/test/util.py index 271c5e1160..dfe9d9bad5 100644 --- a/locust/test/util.py +++ b/locust/test/util.py @@ -2,9 +2,7 @@ import gc import os import socket -import warnings - -from datetime import datetime, timedelta +import datetime from cryptography import x509 from cryptography.x509.oid import NameOID from cryptography.hazmat.primitives import hashes @@ -57,7 +55,7 @@ def create_tls_cert(hostname): """Generate a TLS cert and private key to serve over https""" key = rsa.generate_private_key(public_exponent=2**16 + 1, key_size=2048, backend=default_backend()) name = x509.Name([x509.NameAttribute(NameOID.COMMON_NAME, hostname)]) - now = datetime.utcnow() + now = datetime.datetime.now(tz=datetime.timezone.utc) cert = ( x509.CertificateBuilder() .subject_name(name) @@ -65,7 +63,7 @@ def create_tls_cert(hostname): .public_key(key.public_key()) .serial_number(1000) .not_valid_before(now) - .not_valid_after(now + timedelta(days=10 * 365)) + .not_valid_after(now + datetime.timedelta(days=10 * 365)) .sign(key, hashes.SHA256(), default_backend()) ) cert_pem = cert.public_bytes(encoding=serialization.Encoding.PEM)