summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBert JW Regeer <bertjw@regeer.org>2022-03-12 17:58:47 -0700
committerGitHub <noreply@github.com>2022-03-12 17:58:47 -0700
commit22c03947e3bcd7631120aae40d3d844d4f35e49f (patch)
treef4f844d85a953f28f1ce7380a824eb4ecb306376
parentc87c899dc6b9c56ff8f1fc6a674a25b1109bad85 (diff)
parentdc15d9f91d2ec4c70d347c08f10ba11c02c3f80c (diff)
downloadwaitress-22c03947e3bcd7631120aae40d3d844d4f35e49f.tar.gz
Merge pull request #367 from Pylons/fixup/collect-wasyncore-tests
Make sure to collect all wasyncore tests
-rw-r--r--setup.cfg2
-rw-r--r--tests/test_wasyncore.py18
2 files changed, 10 insertions, 10 deletions
diff --git a/setup.cfg b/setup.cfg
index df71326..b1d2198 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -62,7 +62,7 @@ docs =
[tool:pytest]
python_files = test_*.py
# For the benefit of test_wasyncore.py
-python_classes = Test_*
+python_classes = Test*
testpaths =
tests
addopts = --cov -W always
diff --git a/tests/test_wasyncore.py b/tests/test_wasyncore.py
index af9c3e5..5e0559f 100644
--- a/tests/test_wasyncore.py
+++ b/tests/test_wasyncore.py
@@ -1140,19 +1140,19 @@ class BaseTestAPI:
join_thread(t, timeout=TIMEOUT)
-class TestAPI_UseIPv4Sockets(BaseTestAPI):
+class BaseTestAPI_UseIPv4Sockets(BaseTestAPI):
family = socket.AF_INET
addr = (HOST, 0)
@unittest.skipUnless(IPV6_ENABLED, "IPv6 support required")
-class TestAPI_UseIPv6Sockets(BaseTestAPI):
+class BaseTestAPI_UseIPv6Sockets(BaseTestAPI):
family = socket.AF_INET6
addr = (HOSTv6, 0)
@unittest.skipUnless(HAS_UNIX_SOCKETS, "Unix sockets required")
-class TestAPI_UseUnixSockets(BaseTestAPI):
+class BaseTestAPI_UseUnixSockets(BaseTestAPI):
if HAS_UNIX_SOCKETS:
family = socket.AF_UNIX
addr = TESTFN
@@ -1162,30 +1162,30 @@ class TestAPI_UseUnixSockets(BaseTestAPI):
BaseTestAPI.tearDown(self)
-class TestAPI_UseIPv4Select(TestAPI_UseIPv4Sockets, unittest.TestCase):
+class TestAPI_UseIPv4Select(BaseTestAPI_UseIPv4Sockets, unittest.TestCase):
use_poll = False
@unittest.skipUnless(hasattr(select, "poll"), "select.poll required")
-class TestAPI_UseIPv4Poll(TestAPI_UseIPv4Sockets, unittest.TestCase):
+class TestAPI_UseIPv4Poll(BaseTestAPI_UseIPv6Sockets, unittest.TestCase):
use_poll = True
-class TestAPI_UseIPv6Select(TestAPI_UseIPv6Sockets, unittest.TestCase):
+class TestAPI_UseIPv6Select(BaseTestAPI_UseIPv6Sockets, unittest.TestCase):
use_poll = False
@unittest.skipUnless(hasattr(select, "poll"), "select.poll required")
-class TestAPI_UseIPv6Poll(TestAPI_UseIPv6Sockets, unittest.TestCase):
+class TestAPI_UseIPv6Poll(BaseTestAPI_UseIPv6Sockets, unittest.TestCase):
use_poll = True
-class TestAPI_UseUnixSocketsSelect(TestAPI_UseUnixSockets, unittest.TestCase):
+class TestAPI_UseUnixSocketsSelect(BaseTestAPI_UseUnixSockets, unittest.TestCase):
use_poll = False
@unittest.skipUnless(hasattr(select, "poll"), "select.poll required")
-class TestAPI_UseUnixSocketsPoll(TestAPI_UseUnixSockets, unittest.TestCase):
+class TestAPI_UseUnixSocketsPoll(BaseTestAPI_UseUnixSockets, unittest.TestCase):
use_poll = True