diff options
Diffstat (limited to 'subplot/http.py')
| -rw-r--r-- | subplot/http.py | 26 |
1 files changed, 15 insertions, 11 deletions
diff --git a/subplot/http.py b/subplot/http.py index 424b2b1..cfe8968 100644 --- a/subplot/http.py +++ b/subplot/http.py @@ -6,36 +6,40 @@ import logging # Make an HTTP request. def http_request(ctx, host=None, method=None, url=None): - runcmd = globals()["runcmd"] - exit_code_is = globals()["exit_code_is"] + runcmd_run = globals()["runcmd_run"] + runcmd_exit_code_is = globals()["runcmd_exit_code_is"] logging.debug(f"Make HTTP request: {method} {url}") - runcmd(ctx, ["curl", "-ksv", "-X", method, f"-HHost: {host}", url]) - exit_code_is(ctx, 0) + runcmd_run(ctx, ["curl", "-ksv", "-X", method, f"-HHost: {host}", url]) + runcmd_exit_code_is(ctx, 0) # Check status code of latest HTTP request. def http_status_code_is(ctx, code=None): assert_eq = globals()["assert_eq"] + runcmd_get_stderr = globals()["runcmd_get_stderr"] + stderr = runcmd_get_stderr(ctx) logging.debug(f"Verifying status code of previous HTTP request is {code}") - logging.debug(f" stderr={ctx['stderr']}") + logging.debug(f" stderr={stderr}") pattern = f"\n< HTTP/2 {code} " - assert_eq(pattern in ctx["stderr"], True) + assert_eq(pattern in stderr, True) # Check a HTTP response header for latest request has a given value. def http_header_is(ctx, header=None, value=None): assert_eq = globals()["assert_eq"] + runcmd_get_stderr = globals()["runcmd_get_stderr"] + stderr = runcmd_get_stderr(ctx) logging.debug(f"Verifying response has header {header}: {value}") - s = ctx["stderr"] pattern = f"\n< {header}: {value}" - assert_eq(pattern in s, True) + assert_eq(pattern in stderr, True) # Check a HTTP body response for latest request has a given value. def http_body_is(ctx, body=None): assert_eq = globals()["assert_eq"] + runcmd_get_stdout = globals()["runcmd_get_stdout"] + stdout = runcmd_get_stdout(ctx) logging.debug(f"Verifying response body is {body!r}") - logging.debug(f" actual body={ctx['stdout']!r}") - s = ctx["stdout"] + logging.debug(f" actual body={stdout!r}") body = body.encode("UTF8").decode("unicode-escape") - assert_eq(body, s) + assert_eq(body, stdout) |