aboutsummaryrefslogtreecommitdiffstats
path: root/test/pathod
diff options
context:
space:
mode:
Diffstat (limited to 'test/pathod')
-rw-r--r--test/pathod/test_pathoc.py1
-rw-r--r--test/pathod/test_pathod.py12
-rw-r--r--test/pathod/tutils.py10
3 files changed, 5 insertions, 18 deletions
diff --git a/test/pathod/test_pathoc.py b/test/pathod/test_pathoc.py
index a88cfa91..8b69a2a6 100644
--- a/test/pathod/test_pathoc.py
+++ b/test/pathod/test_pathoc.py
@@ -228,6 +228,7 @@ class TestDaemon(PathocTestDaemon):
class TestDaemonHTTP2(PathocTestDaemon):
ssl = True
+ explain = False
if tcp.HAS_ALPN:
diff --git a/test/pathod/test_pathod.py b/test/pathod/test_pathod.py
index f64b0f61..0bbad6c2 100644
--- a/test/pathod/test_pathod.py
+++ b/test/pathod/test_pathod.py
@@ -23,18 +23,10 @@ class TestPathod(object):
assert len(p.get_log()) <= p.LOGBUF
-class TestNoWeb(tutils.DaemonTests):
- noweb = True
-
- def test_noweb(self):
- assert self.get("200:da").status_code == 200
- assert self.getpath("/").status_code == 800
-
-
class TestTimeout(tutils.DaemonTests):
timeout = 0.01
- def test_noweb(self):
+ def test_timeout(self):
# FIXME: Add float values to spec language, reduce test timeout to
# increase test performance
# This is a bodge - we have some platform difference that causes
@@ -261,8 +253,6 @@ class TestDaemonSSL(CommonTests):
class TestHTTP2(tutils.DaemonTests):
ssl = True
- noweb = True
- noapi = True
nohang = True
if tcp.HAS_ALPN:
diff --git a/test/pathod/tutils.py b/test/pathod/tutils.py
index 1a883c93..56cd2002 100644
--- a/test/pathod/tutils.py
+++ b/test/pathod/tutils.py
@@ -24,14 +24,13 @@ def treader(bytes):
class DaemonTests(object):
- noweb = False
- noapi = False
nohang = False
ssl = False
timeout = None
hexdump = False
ssloptions = None
nocraft = False
+ explain = True
@classmethod
def setup_class(cls):
@@ -47,15 +46,13 @@ class DaemonTests(object):
ssl=cls.ssl,
ssloptions=so,
sizelimit=1 * 1024 * 1024,
- noweb=cls.noweb,
- noapi=cls.noapi,
nohang=cls.nohang,
timeout=cls.timeout,
hexdump=cls.hexdump,
nocraft=cls.nocraft,
logreq=True,
logresp=True,
- explain=True
+ explain=cls.explain
)
@classmethod
@@ -65,8 +62,7 @@ class DaemonTests(object):
def teardown(self):
self.d.wait_for_silence()
- if not (self.noweb or self.noapi):
- self.d.clear_log()
+ self.d.clear_log()
def _getpath(self, path, params=None):
scheme = "https" if self.ssl else "http"