diff options
| -rw-r--r-- | tst/test_check.py | 16 | ||||
| -rw-r--r-- | tst/test_listen.py | 6 |
2 files changed, 9 insertions, 13 deletions
diff --git a/tst/test_check.py b/tst/test_check.py index 23be6f5..c5516e2 100644 --- a/tst/test_check.py +++ b/tst/test_check.py @@ -52,16 +52,12 @@ def failed_to_get_cert(summary): async def get_cert_summary(netloc, after, ca): """Fetch TLS certificate expiration summary for netloc.""" loop = get_running_loop() - while True: - output = StringIO() - await loop.run_in_executor(None, check, [netloc], after, output, ca) - if not output.getvalue(): - return None - summary, = map(parse_summary, output.getvalue().splitlines()) - if 'Connection refused' in summary[-1]: # pragma: no cover - assert failed_to_get_cert(summary) - continue - return summary + output = StringIO() + await loop.run_in_executor(None, check, [netloc], after, output, ca) + if not output.getvalue(): + return None + summary, = map(parse_summary, output.getvalue().splitlines()) + return summary @mark.parametrize('domain', ['localhost']) diff --git a/tst/test_listen.py b/tst/test_listen.py index 45289d5..55a69e0 100644 --- a/tst/test_listen.py +++ b/tst/test_listen.py @@ -50,7 +50,7 @@ def ports(): def serials(): """Return a Hypothesis strategy for TLS serial number.""" - return integers(0, 256**20-1) + return integers(1, 256**20-1) def base64s(): @@ -176,9 +176,9 @@ async def fetch_xml(socket, url, content_type): header_parser = BytesHeaderParser() xml_parser = XMLParser(encoding='utf-8') async with connect(socket) as (reader, writer): - await write_request(writer, f'GET {url} HTTP/2\r\n') + await write_request(writer, f'GET {url} HTTP/1.1\r\n') status = await reader.readuntil(b'\r\n') - assert status == b'HTTP/2 200 OK\r\n' + assert status == b'HTTP/1.1 200 OK\r\n' headers_bytes = await reader.readuntil(b'\r\n\r\n') headers = header_parser.parsebytes(headers_bytes) assert headers['Content-Type'] == content_type |