encode/httpx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Inline SERVER_SCOPE and remove typing_extensions requirement (#1773)

Browse Source
This commit is contained in:
Michał Górny 2021-07-26 16:08:58 +02:00 committed by GitHub
parent b839478661
commit 8c64e0c65f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
tests/conftest.py
View File

@ -14,7 +14,6 @@ from cryptography.hazmat.primitives.serialization import (
PrivateFormat,
load_pem_private_key,
)
from typing_extensions import Literal
from uvicorn.config import Config
from uvicorn.main import Server
@ -165,38 +164,35 @@ async def redirect_301(scope, receive, send):
await send({"type": "http.response.body"})
SERVER_SCOPE: Literal["session"] = "session"
@pytest.fixture(scope=SERVER_SCOPE)
@pytest.fixture(scope="session")
def cert_authority():
return trustme.CA()
@pytest.fixture(scope=SERVER_SCOPE)
@pytest.fixture(scope="session")
def ca_cert_pem_file(cert_authority):
with cert_authority.cert_pem.tempfile() as tmp:
yield tmp
@pytest.fixture(scope=SERVER_SCOPE)
@pytest.fixture(scope="session")
def localhost_cert(cert_authority):
return cert_authority.issue_cert("localhost")
@pytest.fixture(scope=SERVER_SCOPE)
@pytest.fixture(scope="session")
def cert_pem_file(localhost_cert):
with localhost_cert.cert_chain_pems[0].tempfile() as tmp:
yield tmp
@pytest.fixture(scope=SERVER_SCOPE)
@pytest.fixture(scope="session")
def cert_private_key_file(localhost_cert):
with localhost_cert.private_key_pem.tempfile() as tmp:
yield tmp
@pytest.fixture(scope=SERVER_SCOPE)
@pytest.fixture(scope="session")
def cert_encrypted_private_key_file(localhost_cert):
# Deserialize the private key and then reserialize with a password
private_key = load_pem_private_key(
@ -272,14 +268,14 @@ def serve_in_thread(server: Server):
thread.join()
@pytest.fixture(scope=SERVER_SCOPE)
@pytest.fixture(scope="session")
def server():
config = Config(app=app, lifespan="off", loop="asyncio")
server = TestServer(config=config)
yield from serve_in_thread(server)
@pytest.fixture(scope=SERVER_SCOPE)
@pytest.fixture(scope="session")
def https_server(cert_pem_file, cert_private_key_file):
config = Config(
app=app,