diff options
Diffstat (limited to 'deluge/tests/test_json_api.py')
| -rw-r--r-- | deluge/tests/test_json_api.py | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/deluge/tests/test_json_api.py b/deluge/tests/test_json_api.py index 41efb02..ef21e94 100644 --- a/deluge/tests/test_json_api.py +++ b/deluge/tests/test_json_api.py @@ -11,6 +11,7 @@ from unittest.mock import MagicMock import pytest import pytest_twisted +from twisted.internet.defer import Deferred from twisted.web import server from twisted.web.http import Request @@ -29,7 +30,6 @@ common.disable_new_release_check() @pytest.mark.usefixtures('daemon', 'client', 'component') class TestJSON: - @pytest_twisted.ensureDeferred async def test_get_remote_methods(self): json = JSON() methods = await json.get_remote_methods() @@ -150,7 +150,6 @@ class TestRPCRaiseDelugeErrorJSON: daemon.rpcserver.register_object(test) """ - @pytest_twisted.ensureDeferred async def test_handle_request_method_raise_delugeerror(self): json = JSON() @@ -195,7 +194,6 @@ class TestJSONRequestFailed(WebServerMockBase): test = TestClass() daemon.rpcserver.register_object(test) """ - from twisted.internet.defer import Deferred extra_callback = { 'deferred': Deferred(), @@ -210,18 +208,19 @@ class TestJSONRequestFailed(WebServerMockBase): } def on_test_raise(*args): - assert 'Unhandled error in Deferred:' in self.core.stderr_out - assert 'in test_raise_error' in self.core.stderr_out + assert 'Unhandled error in Deferred:' in daemon.stderr_out + assert 'in test_raise_error' in daemon.stderr_out - extra_callback['deferred'].addCallback(on_test_raise) d, daemon = common.start_core( custom_script=custom_script, - print_stdout=False, + print_stdout=True, print_stderr=False, timeout=5, extra_callbacks=[extra_callback], config_directory=config_dir, ) + extra_callback['deferred'].addCallback(on_test_raise, daemon) + await d yield await daemon.kill() |