diff options
Diffstat (limited to 'tests/http/conftest.py')
| -rw-r--r-- | tests/http/conftest.py | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/tests/http/conftest.py b/tests/http/conftest.py index 22386b94d..bd97baa8b 100644 --- a/tests/http/conftest.py +++ b/tests/http/conftest.py @@ -31,8 +31,7 @@ import pytest sys.path.append(os.path.join(os.path.dirname(__file__), '.')) -from testenv import Env, Nghttpx, Httpd - +from testenv import Env, Nghttpx, Httpd, NghttpxQuic, NghttpxFwd @pytest.fixture(scope="package") def env(pytestconfig) -> Env: @@ -68,7 +67,16 @@ def httpd(env) -> Httpd: @pytest.fixture(scope='package') def nghttpx(env, httpd) -> Optional[Nghttpx]: - nghttpx = Nghttpx(env=env) + nghttpx = NghttpxQuic(env=env) + if env.have_h3(): + nghttpx.clear_logs() + assert nghttpx.start() + yield nghttpx + nghttpx.stop() + +@pytest.fixture(scope='package') +def nghttpx_fwd(env, httpd) -> Optional[Nghttpx]: + nghttpx = NghttpxFwd(env=env) if env.have_h3(): nghttpx.clear_logs() assert nghttpx.start() |