Skip to content

Fix timeouts #52

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

Open
gehaxelt wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Fix timeouts #52

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6c5b03d
Implement timeout option
gehaxelt May 26, 2025
470121c
Some bugfixes and version bump to 0.11.0
gehaxelt May 26, 2025
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
1 change: 1 addition & 0 deletions enochecker_test/conftest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,4 @@ def pytest_addoption(parser):
parser.addoption("--noise-variants", action="store", type=int)
parser.addoption("--havoc-variants", action="store", type=int)
parser.addoption("--exploit-variants", action="store", type=int)
parser.addoption("--timeout", action="store", type=int)
21 changes: 17 additions & 4 deletions enochecker_test/main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
from urllib3.util.retry import Retry


def run_tests(host, port, service_address, test_expr):
def run_tests(host, port, service_address, timeout, test_expr):
s = requests.Session()
retry_strategy = Retry(
total=5,
Expand All @@ -26,12 +26,13 @@ def run_tests(host, port, service_address, test_expr):
r.content, CheckerInfoMessage, key_transformer=jsons.KEY_TRANSFORMER_SNAKECASE
)
logging.info(
"Testing service %s, flagVariants: %d, noiseVariants: %d, havocVariants: %d, exploitVariants: %d",
"Testing service %s, flagVariants: %d, noiseVariants: %d, havocVariants: %d, exploitVariants: %d, timeout: %d",
info.service_name,
info.flag_variants,
info.noise_variants,
info.havoc_variants,
info.exploit_variants,
timeout,
)

test_args = [
Expand All @@ -42,6 +43,7 @@ def run_tests(host, port, service_address, test_expr):
f"--noise-variants={info.noise_variants}",
f"--havoc-variants={info.havoc_variants}",
f"--exploit-variants={info.exploit_variants}",
f"--timeout={timeout}",
"--durations=0",
"-v",
]
Expand All @@ -62,7 +64,7 @@ def main():
description="Utility for testing checkers that implement the enochecker API",
epilog="""Example Usage:

$ enochecker_test -a localhost -p 5008 -A 172.20.0.1 test_putflag
$ enochecker_test -a localhost -p 5008 -A 172.20.0.1 -t 10 test_putflag

Assuming that 172.20.0.1 is the ip address of the gateway of the network of the
service's docker container as obtained by e.g:
Expand Down Expand Up @@ -91,6 +93,13 @@ def main():
help="The address on which the checker can reach the service (defaults to ENOCHECKER_TEST_SERVICE_ADDRESS environment variable)",
default=os.environ.get("ENOCHECKER_TEST_SERVICE_ADDRESS"),
)
parser.add_argument(
"-t",
"--timeout",
type=int,
help="The timeout in seconds which the checker has to process the request (defaults to ENOCHECKER_TEST_TIMEOUT or 10s environment variable)",
default=os.environ.get("ENOCHECKER_TEST_TIMEOUT", default=10),
)
parser.add_argument(
"testexpr",
help="Specify the tests that should be run in the syntax expected by pytests -k flag, e.g. 'test_getflag' or 'not exploit'. If no expr is specified, all tests will be run.",
Expand All @@ -117,5 +126,9 @@ def main():

logging.basicConfig(level=logging.INFO)
run_tests(
args.checker_address, args.checker_port, args.service_address, args.testexpr
args.checker_address,
args.checker_port,
args.service_address,
args.timeout,
args.testexpr,
)
Loading