1 files changed, 2 insertions, 30 deletions
diff --git a/ewww.py b/ewww.py
index 3eb6e97..76f27ac 100644
--- a/ewww.py
+++ b/ewww.py
@@ -91,35 +91,7 @@ def stop_server(ctx):
     stop_daemon(ctx, "ewww")
 
 
-# Make a HTTP request.
+# Make an HTTP request.
 def request(ctx, method=None, url=None):
     url, host = _url(ctx, url)
-    print(url)
-    _run(ctx, ["curl", "-ksv", "-X", method, "-HHost: {}".format(host), url])
-    _run_exit(ctx, 0)
-
-
-# Check status code of latest HTTP request.
-def status_code_is(ctx, code=None):
-    pattern = "\n< HTTP/2 {} ".format(code)
-    assert_eq(pattern in ctx["stderr"], True)
-
-
-# Check a HTTP response header for latest request has a given value.
-def http_header_is(ctx, header=None, value=None):
-    s = ctx["stderr"]
-    pattern = "\n< {}: {}".format(header, value)
-    if pattern not in s:
-        print("stderr:", repr(s))
-        print("pattern:", repr(pattern))
-    assert_eq(pattern in s, True)
-
-
-# Check a HTTP body response  for latest request has a given value.
-def http_body_is(ctx, body=None):
-    s = ctx["stdout"]
-    body = body.encode("UTF8").decode("unicode-escape")
-    if body != s:
-        print("stdout:", repr(s))
-        prin("pattern:", repr(body))
-    assert_eq(body, s)
+    http_request(ctx, host=host, method=method, url=url)