Skip to content

[Windows] --threaded mode integration tests works locally but fails on GHA #1009

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Jan 19, 2022
Merged

[Windows] --threaded mode integration tests works locally but fails on GHA #1009

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0ebfd46
Enable remote threadless and threaded integration test for windows
sowmyasudhasingh Jan 19, 2022
f358ec7
Run only threaded on windows
sowmya-jaxl Jan 19, 2022
9d06bbd
Use powershell for execution of integration script on Windows
sowmya-jaxl Jan 19, 2022
46807ab
Update test_integration.py
abhinavsingh Jan 19, 2022
c1c8629
Update test_integration.py
abhinavsingh Jan 19, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
103 changes: 66 additions & 37 deletions tests/integration/test_integration.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,17 @@
import subprocess

from pathlib import Path
from typing import Any, Generator
from subprocess import Popen, check_output
from typing import Any, Generator, List
from subprocess import Popen, check_output as _check_output

from proxy.common.constants import IS_WINDOWS


def check_output(args: List[Any]) -> bytes:
args = args if not IS_WINDOWS else ['powershell'] + args
return _check_output(args)


def _https_server_flags() -> str:
return ' '.join((
'--key-file', 'https-key.pem',
Expand All @@ -37,56 +42,80 @@ def _tls_interception_flags(ca_cert_suffix: str = '') -> str:
))


PROXY_PY_FLAGS_INTEGRATION = (
('--threadless'),
('--threadless --local-executor 0'),
_PROXY_PY_FLAGS_INTEGRATION = [
('--threaded'),
)

PROXY_PY_HTTPS = (
('--threadless ' + _https_server_flags()),
('--threadless --local-executor 0 ' + _https_server_flags()),
]
if not IS_WINDOWS:
_PROXY_PY_FLAGS_INTEGRATION += [
('--threadless --local-executor 0'),
('--threadless'),
]
PROXY_PY_FLAGS_INTEGRATION = tuple(_PROXY_PY_FLAGS_INTEGRATION)

_PROXY_PY_HTTPS = [
('--threaded ' + _https_server_flags()),
)

PROXY_PY_FLAGS_TLS_INTERCEPTION = (
('--threadless ' + _tls_interception_flags()),
('--threadless --local-executor 0 ' + _tls_interception_flags()),
]
if not IS_WINDOWS:
_PROXY_PY_HTTPS += [
('--threadless --local-executor 0 ' + _https_server_flags()),
('--threadless ' + _https_server_flags()),
]
PROXY_PY_HTTPS = tuple(_PROXY_PY_HTTPS)

_PROXY_PY_FLAGS_TLS_INTERCEPTION = [
('--threaded ' + _tls_interception_flags()),
)

PROXY_PY_FLAGS_MODIFY_CHUNK_RESPONSE_PLUGIN = (
(
'--threadless --plugin proxy.plugin.ModifyChunkResponsePlugin ' +
_tls_interception_flags('-chunk')
),
(
'--threadless --local-executor 0 --plugin proxy.plugin.ModifyChunkResponsePlugin ' +
_tls_interception_flags('-chunk')
),
]
if not IS_WINDOWS:
_PROXY_PY_FLAGS_TLS_INTERCEPTION += [
('--threadless --local-executor 0 ' + _tls_interception_flags()),
('--threadless ' + _tls_interception_flags()),
]
PROXY_PY_FLAGS_TLS_INTERCEPTION = tuple(_PROXY_PY_FLAGS_TLS_INTERCEPTION)

_PROXY_PY_FLAGS_MODIFY_CHUNK_RESPONSE_PLUGIN = [
(
'--threaded --plugin proxy.plugin.ModifyChunkResponsePlugin ' +
_tls_interception_flags('-chunk')
),
]
if not IS_WINDOWS:
_PROXY_PY_FLAGS_MODIFY_CHUNK_RESPONSE_PLUGIN += [
(
'--threadless --local-executor 0 --plugin proxy.plugin.ModifyChunkResponsePlugin ' +
_tls_interception_flags('-chunk')
),
(
'--threadless --plugin proxy.plugin.ModifyChunkResponsePlugin ' +
_tls_interception_flags('-chunk')
),
]
PROXY_PY_FLAGS_MODIFY_CHUNK_RESPONSE_PLUGIN = tuple(
_PROXY_PY_FLAGS_MODIFY_CHUNK_RESPONSE_PLUGIN,
)

PROXY_PY_FLAGS_MODIFY_POST_DATA_PLUGIN = (
(
'--threadless --plugin proxy.plugin.ModifyPostDataPlugin ' +
_tls_interception_flags('-post')
),
(
'--threadless --local-executor 0 --plugin proxy.plugin.ModifyPostDataPlugin ' +
_tls_interception_flags('-post')
),
_PROXY_PY_FLAGS_MODIFY_POST_DATA_PLUGIN = [
(
'--threaded --plugin proxy.plugin.ModifyPostDataPlugin ' +
_tls_interception_flags('-post')
),
]
if not IS_WINDOWS:
_PROXY_PY_FLAGS_MODIFY_POST_DATA_PLUGIN += [
(
'--threadless --local-executor 0 --plugin proxy.plugin.ModifyPostDataPlugin ' +
_tls_interception_flags('-post')
),
(
'--threadless --plugin proxy.plugin.ModifyPostDataPlugin ' +
_tls_interception_flags('-post')
),
]
PROXY_PY_FLAGS_MODIFY_POST_DATA_PLUGIN = tuple(
_PROXY_PY_FLAGS_MODIFY_POST_DATA_PLUGIN,
)


@pytest.fixture(scope='session', autouse=True) # type: ignore[misc]
@pytest.fixture(scope='session', autouse=not IS_WINDOWS) # type: ignore[misc]
def _gen_https_certificates(request: Any) -> None:
check_output([
'make', 'https-certificates',
Expand All @@ -96,7 +125,7 @@ def _gen_https_certificates(request: Any) -> None:
])


@pytest.fixture(scope='session', autouse=True) # type: ignore[misc]
@pytest.fixture(scope='session', autouse=not IS_WINDOWS) # type: ignore[misc]
def _gen_ca_certificates(request: Any) -> None:
check_output([
'make', 'ca-certificates',
Expand Down