Skip to content
Snippets Groups Projects
Commit dea7d6cd authored by E. Madison Bray's avatar E. Madison Bray
Browse files

[testing] rename these functions so that pytest doesn't try to collect them as a test

parent cafd7287
No related branches found
No related tags found
No related merge requests found
Pipeline #1241 passed
......@@ -13,7 +13,7 @@ import tempfile
import pytest
from . import get_free_port_safe, generate_articles, random_user_id, retry
from .server import test_server_thread
from .server import dummy_server_thread
class RecsystemFunctionalTest(metaclass=abc.ABCMeta):
......@@ -84,7 +84,7 @@ class RecsystemFunctionalTest(metaclass=abc.ABCMeta):
# start up the test server
with get_free_port_safe() as port:
cls.server = test_server_thread(port)
cls.server = dummy_server_thread(port)
cls.server.wait()
# start up the recsystem using the given port
......
......@@ -140,7 +140,7 @@ def _make_server_task(port, articles=None, get_rpc_call=None,
return task
def test_server(port=None, articles=None, quiet=False, **kwargs):
def dummy_server(port=None, articles=None, quiet=False, **kwargs):
loop = asyncio.get_event_loop()
try:
server_task = _make_server_task(port, articles, quiet=quiet, **kwargs)
......@@ -168,10 +168,10 @@ class ServerThread(threading.Thread):
self._rpc_call_queue = asyncio.Queue()
self._rpc_result_queue = asyncio.Queue()
self._stop_event = asyncio.Event()
test_server(get_rpc_call=self._rpc_call_queue.get,
put_rpc_result=self._rpc_result_queue.put,
shutdown_trigger=self._stop_event.wait,
**self._server_kwargs)
dummy_server(get_rpc_call=self._rpc_call_queue.get,
put_rpc_result=self._rpc_result_queue.put,
shutdown_trigger=self._stop_event.wait,
**self._server_kwargs)
def wait(self):
"""Wait for the server port to be bound."""
......@@ -219,9 +219,9 @@ class ServerThread(threading.Thread):
return
def test_server_thread(port=None, articles=None, quiet=True, **kwargs):
def dummy_server_thread(port=None, articles=None, quiet=True, **kwargs):
"""
Starts `test_server` but in its own thread.
Starts `dummy_server` but in its own thread.
Returns a `ServerThread` object which has `ServerThread.request` and
`ServerThread.notify` methods which send JSON-RPC calls to the connected
......@@ -233,9 +233,9 @@ def test_server_thread(port=None, articles=None, quiet=True, **kwargs):
First start up the server thread:
>>> from renewal_recsystem.utils.testing import get_free_port_safe
>>> from renewal_recsystem.utils.testing.server import test_server_thread
>>> from renewal_recsystem.utils.testing.server import dummy_server_thread
>>> with get_free_port_safe() as port:
... server_thread = test_server_thread(port=port)
... server_thread = dummy_server_thread(port=port)
... server_thread.wait()
...
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment