aboutsummaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
Diffstat (limited to 'test')
-rw-r--r--test/test_cmdline.py155
-rw-r--r--test/test_language_http2.py177
-rw-r--r--test/test_pathoc.py61
-rw-r--r--test/test_pathoc_cmdline.py64
-rw-r--r--test/test_pathod.py14
-rw-r--r--test/test_pathod_cmdline.py85
-rw-r--r--test/tutils.py8
7 files changed, 401 insertions, 163 deletions
diff --git a/test/test_cmdline.py b/test/test_cmdline.py
deleted file mode 100644
index c1b55608..00000000
--- a/test/test_cmdline.py
+++ /dev/null
@@ -1,155 +0,0 @@
-from libpathod import cmdline
-import tutils
-import cStringIO
-import mock
-
-
-@mock.patch("argparse.ArgumentParser.error")
-def test_pathod(perror):
- assert cmdline.args_pathod(["pathod"])
-
- a = cmdline.args_pathod(
- [
- "pathod",
- "--cert",
- tutils.test_data.path("data/testkey.pem")
- ]
- )
- assert a.ssl_certs
-
- a = cmdline.args_pathod(
- [
- "pathod",
- "--cert",
- "nonexistent"
- ]
- )
- assert perror.called
- perror.reset_mock()
-
- a = cmdline.args_pathod(
- [
- "pathod",
- "-a",
- "foo=200"
- ]
- )
- assert a.anchors
-
- a = cmdline.args_pathod(
- [
- "pathod",
- "-a",
- "foo=" + tutils.test_data.path("data/response")
- ]
- )
- assert a.anchors
-
- a = cmdline.args_pathod(
- [
- "pathod",
- "-a",
- "?=200"
- ]
- )
- assert perror.called
- perror.reset_mock()
-
- a = cmdline.args_pathod(
- [
- "pathod",
- "-a",
- "foo"
- ]
- )
- assert perror.called
- perror.reset_mock()
-
- s = cStringIO.StringIO()
- tutils.raises(
- SystemExit,
- cmdline.args_pathod,
- ["pathod", "-a", "foo=."],
- s,
- s
- )
-
- a = cmdline.args_pathod(
- [
- "pathod",
- "--limit-size",
- "200k"
- ]
- )
- assert a.sizelimit
-
- a = cmdline.args_pathod(
- [
- "pathod",
- "--limit-size",
- "q"
- ]
- )
- assert perror.called
- perror.reset_mock()
-
-
-@mock.patch("argparse.ArgumentParser.error")
-def test_pathoc(perror):
- assert cmdline.args_pathoc(["pathoc", "foo.com", "get:/"])
- s = cStringIO.StringIO()
- tutils.raises(
- SystemExit, cmdline.args_pathoc, [
- "pathoc", "--show-uas"], s, s)
-
- a = cmdline.args_pathoc(["pathoc", "foo.com:8888", "get:/"])
- assert a.port == 8888
-
- a = cmdline.args_pathoc(["pathoc", "foo.com:xxx", "get:/"])
- assert perror.called
- perror.reset_mock()
-
- a = cmdline.args_pathoc(["pathoc", "-I", "10, 20", "foo.com:8888", "get:/"])
- assert a.ignorecodes == [10, 20]
-
- a = cmdline.args_pathoc(["pathoc", "-I", "xx, 20", "foo.com:8888", "get:/"])
- assert perror.called
- perror.reset_mock()
-
- a = cmdline.args_pathoc(["pathoc", "-c", "foo:10", "foo.com:8888", "get:/"])
- assert a.connect_to == ["foo", 10]
-
- a = cmdline.args_pathoc(["pathoc", "-c", "foo", "foo.com:8888", "get:/"])
- assert perror.called
- perror.reset_mock()
-
- a = cmdline.args_pathoc(
- ["pathoc", "-c", "foo:bar", "foo.com:8888", "get:/"])
- assert perror.called
- perror.reset_mock()
-
- a = cmdline.args_pathoc(
- [
- "pathoc",
- "foo.com:8888",
- tutils.test_data.path("data/request")
- ]
- )
- assert len(list(a.requests)) == 1
-
- a = cmdline.args_pathod(
- [
- "pathod",
- "-c",
- "?"
- ]
- )
- assert perror.called
- perror.reset_mock()
-
- tutils.raises(
- SystemExit,
- cmdline.args_pathoc,
- ["pathoc", "foo.com", "invalid"],
- s, s
- )
diff --git a/test/test_language_http2.py b/test/test_language_http2.py
new file mode 100644
index 00000000..0be42253
--- /dev/null
+++ b/test/test_language_http2.py
@@ -0,0 +1,177 @@
+import cStringIO
+
+from netlib import tcp
+from libpathod import language
+from libpathod.language import http2, base
+import netlib
+import tutils
+
+
+def parse_request(s):
+ return language.parse_pathoc(s, True).next()
+
+def parse_response(s):
+ return language.parse_pathod(s, True).next()
+
+def default_settings():
+ return language.Settings(
+ request_host = "foo.com",
+ protocol = netlib.http2.HTTP2Protocol(tcp.TCPClient(('localhost', 1234)))
+ )
+
+
+def test_make_error_response():
+ d = cStringIO.StringIO()
+ s = http2.make_error_response("foo", "bar")
+ language.serve(s, d, default_settings())
+
+
+class TestRequest:
+ def test_cached_values(self):
+ req = parse_request("get:/")
+ req_id = id(req)
+ assert req_id == id(req.resolve(default_settings()))
+ assert req.values(default_settings()) == req.values(default_settings())
+
+ def test_nonascii(self):
+ tutils.raises("ascii", parse_request, "get:\xf0")
+
+ def test_err(self):
+ tutils.raises(language.ParseException, parse_request, 'GET')
+
+ def test_simple(self):
+ r = parse_request('GET:"/foo"')
+ assert r.method.string() == "GET"
+ assert r.path.string() == "/foo"
+ r = parse_request('GET:/foo')
+ assert r.path.string() == "/foo"
+
+ def test_multiple(self):
+ r = list(language.parse_pathoc("GET:/ PUT:/"))
+ assert r[0].method.string() == "GET"
+ assert r[1].method.string() == "PUT"
+ assert len(r) == 2
+
+ l = """
+ GET
+ "/foo"
+
+ PUT
+
+ "/foo
+
+
+
+ bar"
+ """
+ r = list(language.parse_pathoc(l, True))
+ assert len(r) == 2
+ assert r[0].method.string() == "GET"
+ assert r[1].method.string() == "PUT"
+
+ l = """
+ get:"http://localhost:9999/p/200"
+ get:"http://localhost:9999/p/200"
+ """
+ r = list(language.parse_pathoc(l, True))
+ assert len(r) == 2
+ assert r[0].method.string() == "GET"
+ assert r[1].method.string() == "GET"
+
+ def test_render_simple(self):
+ s = cStringIO.StringIO()
+ r = parse_request("GET:'/foo'")
+ assert language.serve(
+ r,
+ s,
+ default_settings(),
+ )
+
+ def test_render_with_headers(self):
+ s = cStringIO.StringIO()
+ r = parse_request('GET:/foo:h"foo"="bar"')
+ assert language.serve(
+ r,
+ s,
+ default_settings(),
+ )
+
+ def test_render_with_body(self):
+ s = cStringIO.StringIO()
+ r = parse_request("GET:'/foo':bfoobar")
+ assert language.serve(
+ r,
+ s,
+ default_settings(),
+ )
+
+ def test_spec(self):
+ def rt(s):
+ s = parse_request(s).spec()
+ assert parse_request(s).spec() == s
+ rt("get:/foo")
+
+
+class TestResponse:
+ def test_cached_values(self):
+ res = parse_response("200")
+ res_id = id(res)
+ assert res_id == id(res.resolve(default_settings()))
+ assert res.values(default_settings()) == res.values(default_settings())
+
+ def test_nonascii(self):
+ tutils.raises("ascii", parse_response, "200:\xf0")
+
+ def test_err(self):
+ tutils.raises(language.ParseException, parse_response, 'GET:/')
+
+ def test_simple(self):
+ r = parse_response('200')
+ assert r.code.string() == "200"
+ assert len(r.headers) == 0
+
+ r = parse_response('200:h"foo"="bar"')
+ assert r.code.string() == "200"
+ assert len(r.headers) == 1
+ assert r.headers[0].values(default_settings()) == ("foo", "bar")
+ assert r.body == None
+
+ r = parse_response('200:h"foo"="bar":bfoobar:h"bla"="fasel"')
+ assert r.code.string() == "200"
+ assert len(r.headers) == 2
+ assert r.headers[0].values(default_settings()) == ("foo", "bar")
+ assert r.headers[1].values(default_settings()) == ("bla", "fasel")
+ assert r.body.string() == "foobar"
+
+ def test_render_simple(self):
+ s = cStringIO.StringIO()
+ r = parse_response('200')
+ assert language.serve(
+ r,
+ s,
+ default_settings(),
+ )
+
+ def test_render_with_headers(self):
+ s = cStringIO.StringIO()
+ r = parse_response('200:h"foo"="bar"')
+ assert language.serve(
+ r,
+ s,
+ default_settings(),
+ )
+
+ def test_render_with_body(self):
+ s = cStringIO.StringIO()
+ r = parse_response('200:bfoobar')
+ assert language.serve(
+ r,
+ s,
+ default_settings(),
+ )
+
+ def test_spec(self):
+ def rt(s):
+ s = parse_response(s).spec()
+ assert parse_response(s).spec() == s
+ rt("200:bfoobar")
diff --git a/test/test_pathoc.py b/test/test_pathoc.py
index c00c7d53..d39f9275 100644
--- a/test/test_pathoc.py
+++ b/test/test_pathoc.py
@@ -1,8 +1,9 @@
import json
import cStringIO
import re
+from mock import Mock
-from netlib import tcp, http
+from netlib import tcp, http, http2
from libpathod import pathoc, test, version, pathod, language
import tutils
@@ -22,7 +23,7 @@ class _TestDaemon:
ssloptions = self.ssloptions,
staticdir = tutils.test_data.path("data"),
anchors = [
- (re.compile("/anchor/.*"), language.parse_pathod("202"))
+ (re.compile("/anchor/.*"), "202")
]
)
@@ -86,8 +87,9 @@ class _TestDaemon:
class TestDaemonSSL(_TestDaemon):
ssl = True
ssloptions = pathod.SSLOptions(
- request_client_cert=True,
- sans = ["test1.com", "test2.com"]
+ request_client_cert = True,
+ sans = ["test1.com", "test2.com"],
+ alpn_select = http2.HTTP2Protocol.ALPN_PROTO_H2,
)
def test_sni(self):
@@ -119,6 +121,14 @@ class TestDaemonSSL(_TestDaemon):
d = json.loads(r.content)
assert d["log"][0]["request"]["clientcert"]["keyinfo"]
+ def test_http2_without_ssl(self):
+ c = pathoc.Pathoc(
+ ("127.0.0.1", self.d.port),
+ use_http2 = True,
+ ssl = False,
+ )
+ tutils.raises(NotImplementedError, c.connect)
+
class TestDaemon(_TestDaemon):
ssl = False
@@ -216,3 +226,46 @@ class TestDaemon(_TestDaemon):
"HTTP/1.1 200 OK\r\n"
)
c.http_connect(to)
+
+
+class TestDaemonHTTP2(_TestDaemon):
+ ssl = True
+
+ def test_http2(self):
+ c = pathoc.Pathoc(
+ ("127.0.0.1", self.d.port),
+ use_http2 = True,
+ ssl = True,
+ )
+ assert isinstance(c.protocol, http2.HTTP2Protocol)
+
+ c = pathoc.Pathoc(
+ ("127.0.0.1", self.d.port),
+ )
+ assert c.protocol == None # TODO: change if other protocols get implemented
+
+ def test_http2_alpn(self):
+ c = pathoc.Pathoc(
+ ("127.0.0.1", self.d.port),
+ ssl = True,
+ use_http2 = True,
+ http2_skip_connection_preface = True,
+ )
+
+ tmp_convert_to_ssl = c.convert_to_ssl
+ c.convert_to_ssl = Mock()
+ c.convert_to_ssl.side_effect = tmp_convert_to_ssl
+ c.connect()
+
+ _, kwargs = c.convert_to_ssl.call_args
+ assert set(kwargs['alpn_protos']) == set([b'http1.1', b'h2'])
+
+ def test_request(self):
+ c = pathoc.Pathoc(
+ ("127.0.0.1", self.d.port),
+ ssl = True,
+ use_http2 = True,
+ )
+ c.connect()
+ resp = c.request("get:/p/200")
+ assert resp.status_code == "200"
diff --git a/test/test_pathoc_cmdline.py b/test/test_pathoc_cmdline.py
new file mode 100644
index 00000000..6c070aed
--- /dev/null
+++ b/test/test_pathoc_cmdline.py
@@ -0,0 +1,64 @@
+from libpathod import pathoc_cmdline as cmdline
+import tutils
+import cStringIO
+import mock
+
+
+@mock.patch("argparse.ArgumentParser.error")
+def test_pathoc(perror):
+ assert cmdline.args_pathoc(["pathoc", "foo.com", "get:/"])
+ s = cStringIO.StringIO()
+ tutils.raises(
+ SystemExit, cmdline.args_pathoc, [
+ "pathoc", "--show-uas"], s, s)
+
+ a = cmdline.args_pathoc(["pathoc", "foo.com:8888", "get:/"])
+ assert a.port == 8888
+
+ a = cmdline.args_pathoc(["pathoc", "foo.com:xxx", "get:/"])
+ assert perror.called
+ perror.reset_mock()
+
+ a = cmdline.args_pathoc(["pathoc", "-I", "10, 20", "foo.com:8888", "get:/"])
+ assert a.ignorecodes == [10, 20]
+
+ a = cmdline.args_pathoc(["pathoc", "-I", "xx, 20", "foo.com:8888", "get:/"])
+ assert perror.called
+ perror.reset_mock()
+
+ a = cmdline.args_pathoc(["pathoc", "-c", "foo:10", "foo.com:8888", "get:/"])
+ assert a.connect_to == ["foo", 10]
+
+ a = cmdline.args_pathoc(["pathoc", "foo.com", "get:/", "--http2"])
+ assert a.use_http2 == True
+ assert a.ssl == True
+
+ a = cmdline.args_pathoc(["pathoc", "foo.com", "get:/", "--http2-skip-connection-preface"])
+ assert a.use_http2 == True
+ assert a.ssl == True
+ assert a.http2_skip_connection_preface == True
+
+ a = cmdline.args_pathoc(["pathoc", "-c", "foo", "foo.com:8888", "get:/"])
+ assert perror.called
+ perror.reset_mock()
+
+ a = cmdline.args_pathoc(
+ ["pathoc", "-c", "foo:bar", "foo.com:8888", "get:/"])
+ assert perror.called
+ perror.reset_mock()
+
+ a = cmdline.args_pathoc(
+ [
+ "pathoc",
+ "foo.com:8888",
+ tutils.test_data.path("data/request")
+ ]
+ )
+ assert len(list(a.requests)) == 1
+
+ tutils.raises(
+ SystemExit,
+ cmdline.args_pathoc,
+ ["pathoc", "foo.com", "invalid"],
+ s, s
+ )
diff --git a/test/test_pathod.py b/test/test_pathod.py
index f85ef38d..1a3a5004 100644
--- a/test/test_pathod.py
+++ b/test/test_pathod.py
@@ -1,7 +1,7 @@
import sys
import cStringIO
from libpathod import pathod, version
-from netlib import tcp, http
+from netlib import tcp, http, http2
import tutils
@@ -269,3 +269,15 @@ class TestDaemonSSL(CommonTests):
r, _ = self.pathoc([r"get:/p/202"])
assert r[0].status_code == 202
assert self.d.last_log()["cipher"][1] > 0
+
+class TestHTTP2(tutils.DaemonTests):
+ force_http2 = True
+ ssl = True
+ noweb = True
+ noapi = True
+ nohang = True
+
+ def test_http2(self):
+ r, _ = self.pathoc(["GET:/"], ssl=True, use_http2=True)
+ print(r)
+ assert r[0].status_code == "800"
diff --git a/test/test_pathod_cmdline.py b/test/test_pathod_cmdline.py
new file mode 100644
index 00000000..829c4b32
--- /dev/null
+++ b/test/test_pathod_cmdline.py
@@ -0,0 +1,85 @@
+from libpathod import pathod_cmdline as cmdline
+import tutils
+import cStringIO
+import mock
+
+
+@mock.patch("argparse.ArgumentParser.error")
+def test_pathod(perror):
+ assert cmdline.args_pathod(["pathod"])
+
+ a = cmdline.args_pathod(
+ [
+ "pathod",
+ "--cert",
+ tutils.test_data.path("data/testkey.pem")
+ ]
+ )
+ assert a.ssl_certs
+
+ a = cmdline.args_pathod(
+ [
+ "pathod",
+ "--cert",
+ "nonexistent"
+ ]
+ )
+ assert perror.called
+ perror.reset_mock()
+
+ a = cmdline.args_pathod(
+ [
+ "pathod",
+ "-a",
+ "foo=200"
+ ]
+ )
+ assert a.anchors
+
+ a = cmdline.args_pathod(
+ [
+ "pathod",
+ "-a",
+ "foo=" + tutils.test_data.path("data/response")
+ ]
+ )
+ assert a.anchors
+
+ a = cmdline.args_pathod(
+ [
+ "pathod",
+ "-a",
+ "?=200"
+ ]
+ )
+ assert perror.called
+ perror.reset_mock()
+
+ a = cmdline.args_pathod(
+ [
+ "pathod",
+ "-a",
+ "foo"
+ ]
+ )
+ assert perror.called
+ perror.reset_mock()
+
+ a = cmdline.args_pathod(
+ [
+ "pathod",
+ "--limit-size",
+ "200k"
+ ]
+ )
+ assert a.sizelimit
+
+ a = cmdline.args_pathod(
+ [
+ "pathod",
+ "--limit-size",
+ "q"
+ ]
+ )
+ assert perror.called
+ perror.reset_mock()
diff --git a/test/tutils.py b/test/tutils.py
index c56c60d4..2184ade5 100644
--- a/test/tutils.py
+++ b/test/tutils.py
@@ -27,7 +27,7 @@ class DaemonTests(object):
klass.d = test.Daemon(
staticdir=test_data.path("data"),
anchors=[
- (re.compile("/anchor/.*"), language.parse_pathod("202:da"))
+ (re.compile("/anchor/.*"), "202:da")
],
ssl = klass.ssl,
ssloptions = so,
@@ -73,7 +73,8 @@ class DaemonTests(object):
timeout=None,
connect_to=None,
ssl=None,
- ws_read_limit=None
+ ws_read_limit=None,
+ use_http2=False,
):
"""
Returns a (messages, text log) tuple.
@@ -86,7 +87,8 @@ class DaemonTests(object):
ssl=ssl,
ws_read_limit=ws_read_limit,
timeout = timeout,
- fp = logfp
+ fp = logfp,
+ use_http2 = use_http2,
)
c.connect(connect_to)
ret = []
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-11 03:07:26 +0000