mirror of
https://github.com/Tautulli/Tautulli.git
synced 2025-07-11 15:56:07 -07:00
Bump cheroot from 10.0.0 to 10.0.1 (#2310)
* Bump cheroot from 10.0.0 to 10.0.1 Bumps [cheroot](https://github.com/cherrypy/cheroot) from 10.0.0 to 10.0.1. - [Release notes](https://github.com/cherrypy/cheroot/releases) - [Changelog](https://github.com/cherrypy/cheroot/blob/main/CHANGES.rst) - [Commits](https://github.com/cherrypy/cheroot/compare/v10.0.0...v10.0.1) --- updated-dependencies: - dependency-name: cheroot dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> * Update cheroot==10.0.1 --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: JonnyWong16 <9099342+JonnyWong16@users.noreply.github.com> [skip ci]
This commit is contained in:
parent
bcac5b7897
commit
6414a0ba12
10 changed files with 534 additions and 128 deletions
|
@ -31,7 +31,7 @@ config = {
|
|||
|
||||
|
||||
@contextmanager
|
||||
def cheroot_server(server_factory):
|
||||
def cheroot_server(server_factory): # noqa: WPS210
|
||||
"""Set up and tear down a Cheroot server instance."""
|
||||
conf = config[server_factory].copy()
|
||||
bind_port = conf.pop('bind_addr')[-1]
|
||||
|
@ -41,7 +41,7 @@ def cheroot_server(server_factory):
|
|||
actual_bind_addr = (interface, bind_port)
|
||||
httpserver = server_factory( # create it
|
||||
bind_addr=actual_bind_addr,
|
||||
**conf
|
||||
**conf,
|
||||
)
|
||||
except OSError:
|
||||
pass
|
||||
|
@ -50,27 +50,52 @@ def cheroot_server(server_factory):
|
|||
|
||||
httpserver.shutdown_timeout = 0 # Speed-up tests teardown
|
||||
|
||||
threading.Thread(target=httpserver.safe_start).start() # spawn it
|
||||
# FIXME: Expose this thread through a fixture so that it
|
||||
# FIXME: could be awaited in tests.
|
||||
server_thread = threading.Thread(target=httpserver.safe_start)
|
||||
server_thread.start() # spawn it
|
||||
while not httpserver.ready: # wait until fully initialized and bound
|
||||
time.sleep(0.1)
|
||||
|
||||
yield httpserver
|
||||
|
||||
httpserver.stop() # destroy it
|
||||
try:
|
||||
yield server_thread, httpserver
|
||||
finally:
|
||||
httpserver.stop() # destroy it
|
||||
server_thread.join() # wait for the thread to be turn down
|
||||
|
||||
|
||||
@pytest.fixture
|
||||
def wsgi_server():
|
||||
def thread_and_wsgi_server():
|
||||
"""Set up and tear down a Cheroot WSGI server instance.
|
||||
|
||||
This emits a tuple of a thread and a server instance.
|
||||
"""
|
||||
with cheroot_server(cheroot.wsgi.Server) as (server_thread, srv):
|
||||
yield server_thread, srv
|
||||
|
||||
|
||||
@pytest.fixture
|
||||
def thread_and_native_server():
|
||||
"""Set up and tear down a Cheroot HTTP server instance.
|
||||
|
||||
This emits a tuple of a thread and a server instance.
|
||||
"""
|
||||
with cheroot_server(cheroot.server.HTTPServer) as (server_thread, srv):
|
||||
yield server_thread, srv
|
||||
|
||||
|
||||
@pytest.fixture
|
||||
def wsgi_server(thread_and_wsgi_server): # noqa: WPS442
|
||||
"""Set up and tear down a Cheroot WSGI server instance."""
|
||||
with cheroot_server(cheroot.wsgi.Server) as srv:
|
||||
yield srv
|
||||
_server_thread, srv = thread_and_wsgi_server
|
||||
return srv
|
||||
|
||||
|
||||
@pytest.fixture
|
||||
def native_server():
|
||||
def native_server(thread_and_native_server): # noqa: WPS442
|
||||
"""Set up and tear down a Cheroot HTTP server instance."""
|
||||
with cheroot_server(cheroot.server.HTTPServer) as srv:
|
||||
yield srv
|
||||
_server_thread, srv = thread_and_native_server
|
||||
return srv
|
||||
|
||||
|
||||
class _TestClient:
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue