Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
openSUSE:Leap:15.2:PowerPC
python-python-jsonrpc-server
python-jsonrpc-server-pr37.patch
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File python-jsonrpc-server-pr37.patch of Package python-python-jsonrpc-server
From 0a04cc4e9d44233b1038b12d63cd3bd437c2374e Mon Sep 17 00:00:00 2001 From: Benjamin Greiner <code@bnavigator.de> Date: Fri, 1 May 2020 21:46:56 +0200 Subject: [PATCH 1/2] fix endpoint exception lists for Python 3.8 Author: @maximbaz according to #33 --- pyls_jsonrpc/endpoint.py | 1 + test/test_endpoint.py | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/pyls_jsonrpc/endpoint.py b/pyls_jsonrpc/endpoint.py index e8bfb5b..0caf612 100644 --- a/pyls_jsonrpc/endpoint.py +++ b/pyls_jsonrpc/endpoint.py @@ -236,6 +236,7 @@ class Endpoint(object): if error is not None: log.debug("Received error response to message %s: %s", msg_id, error) request_future.set_exception(JsonRpcException.from_dict(error)) + return log.debug("Received result for message %s: %s", msg_id, result) request_future.set_result(result) diff --git a/test/test_endpoint.py b/test/test_endpoint.py index 47a038b..b954732 100644 --- a/test/test_endpoint.py +++ b/test/test_endpoint.py @@ -115,9 +115,9 @@ def test_request_cancel(endpoint, consumer): 'params': {'id': MSG_ID} }) - with pytest.raises(exceptions.JsonRpcException) as exc_info: + with pytest.raises((exceptions.JsonRpcException, futures.CancelledError)) as exc_info: assert future.result(timeout=2) - assert exc_info.type == exceptions.JsonRpcRequestCancelled + assert exc_info.type in (exceptions.JsonRpcRequestCancelled, futures.CancelledError) def test_consume_notification(endpoint, dispatcher): -- 2.26.2 From 5af6e43d0c1fb9a6a29b96d38cfd6dbeec85d0ea Mon Sep 17 00:00:00 2001 From: Benjamin Greiner <code@bnavigator.de> Date: Fri, 1 May 2020 21:50:41 +0200 Subject: [PATCH 2/2] fix test_writer_bad_message not only windows can have problems with serializing datetime --- test/test_streams.py | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/test/test_streams.py b/test/test_streams.py index 8c2e93e..480a73b 100644 --- a/test/test_streams.py +++ b/test/test_streams.py @@ -97,7 +97,8 @@ def test_writer(wfile, writer): def test_writer_bad_message(wfile, writer): # A datetime isn't serializable(or poorly serializable), - # ensure the write method doesn't throw + # ensure the write method doesn't throw, but the result could be empty + # or the correct datetime import datetime writer.write(datetime.datetime( year=2019, @@ -108,12 +109,10 @@ def test_writer_bad_message(wfile, writer): second=1, )) - if os.name == 'nt': - assert wfile.getvalue() == b'' - else: - assert wfile.getvalue() == ( - b'Content-Length: 10\r\n' - b'Content-Type: application/vscode-jsonrpc; charset=utf8\r\n' - b'\r\n' - b'1546304461' - ) + assert wfile.getvalue() in [ + b'', + b'Content-Length: 10\r\n' + b'Content-Type: application/vscode-jsonrpc; charset=utf8\r\n' + b'\r\n' + b'1546304461' + ] -- 2.26.2
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor