From ee0a4a935a95a9472655f85a04e1323f3d328898 Mon Sep 17 00:00:00 2001 From: Wojtek Kosior Date: Thu, 17 Feb 2022 16:31:42 +0100 Subject: automatically pick up a free port to run the HTTP proxy on It is now possible to run multiple `make test` commands in parallel (e.g. testing abrowser and librewolf simultaneously after running `configure` for each of them in 2 different directories). --- test/haketilo_test/__main__.py | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) (limited to 'test/haketilo_test/__main__.py') diff --git a/test/haketilo_test/__main__.py b/test/haketilo_test/__main__.py index 3664e8c..18ef5b5 100644 --- a/test/haketilo_test/__main__.py +++ b/test/haketilo_test/__main__.py @@ -40,7 +40,7 @@ from .extension_crafting import get_extension_base_url def fail(msg, error_code): print('Error:', msg) - print('Usage:', sys.argv[0], '[--load-haketilo]', '[certificates_directory] [proxy_port]') + print('Usage:', sys.argv[0], '[--load-haketilo]', '[certificates_directory]') sys.exit(error_code) load_haketilo = False @@ -55,16 +55,8 @@ certdir = Path(sys.argv[argv_idx]).resolve() if len(sys.argv) > argv_idx \ if not certdir.is_dir(): fail('selected certificate directory does not exist.', 2) -argv_idx += 1 - -port = sys.argv[argv_idx] if len(sys.argv) > argv_idx \ - else str(default_proxy_port) - -if not port.isnumeric(): - fail('port must be an integer.', 3) - -httpd = do_an_internet(certdir, int(port)) -driver = firefox_safe_mode(proxy_port=int(port)) +httpd = do_an_internet(certdir) +driver = firefox_safe_mode(proxy_port=httpd.server_port) if load_haketilo: driver.install_addon(str(Path.cwd() / 'mozilla-build.zip'), temporary=True) -- cgit v1.2.3