mirrors/deluge
0
0
Fork 0
mirror of https://git.deluge-torrent.org/deluge synced 2025-08-09 09:58:39 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[Tests] Fix to json tests

Browse source
This commit is contained in:
bendikro 2016-04-10 01:14:26 +02:00
commit 712b2715d4
1 changed files with 1 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

9
deluge/tests/test_json_api.py
View file

@ -94,7 +94,6 @@ class JSONTestCase(JSONBase):
self.assertEquals(json.render(request), server.NOT_DONE_YET) self.assertEquals(json.render(request), server.NOT_DONE_YET)
self.assertTrue(request.write_was_called) self.assertTrue(request.write_was_called)
@defer.inlineCallbacks
def test_handle_request_invalid_method(self): def test_handle_request_invalid_method(self):
json = JSON() json = JSON()
request = MagicMock() request = MagicMock()
@ -102,10 +101,7 @@ class JSONTestCase(JSONBase):
request.json = json_lib.dumps(json_data) request.json = json_lib.dumps(json_data)
request_id, result, error = json._handle_request(request) request_id, result, error = json._handle_request(request)
self.assertEquals(error, {'message': 'Unknown method', 'code': 2}) self.assertEquals(error, {'message': 'Unknown method', 'code': 2})
yield
return
@defer.inlineCallbacks
def test_handle_request_invalid_json_request(self): def test_handle_request_invalid_json_request(self):
json = JSON() json = JSON()
request = MagicMock() request = MagicMock()
@ -115,7 +111,6 @@ class JSONTestCase(JSONBase):
self.assertRaises(JSONException, json._handle_request, request) self.assertRaises(JSONException, json._handle_request, request)
request.json = json_lib.dumps({"method": "some.method", "id": 0}) request.json = json_lib.dumps({"method": "some.method", "id": 0})
self.assertRaises(JSONException, json._handle_request, request) self.assertRaises(JSONException, json._handle_request, request)
yield
class JSONCustomUserTestCase(JSONBase): class JSONCustomUserTestCase(JSONBase):
@ -141,7 +136,6 @@ class JSONCustomUserTestCase(JSONBase):
request.json = json_lib.dumps(json_data) request.json = json_lib.dumps(json_data)
request_id, result, error = json._handle_request(request) request_id, result, error = json._handle_request(request)
self.assertEquals(error, {'message': 'Not authenticated', 'code': 1}) self.assertEquals(error, {'message': 'Not authenticated', 'code': 1})
return
class RPCRaiseDelugeErrorJSONTestCase(JSONBase): class RPCRaiseDelugeErrorJSONTestCase(JSONBase):
@ -189,8 +183,7 @@ class RPCRaiseDelugeErrorJSONTestCase(JSONBase):
def on_error(error): def on_error(error):
self.assertEquals(error.type, DelugeError) self.assertEquals(error.type, DelugeError)
result.addErrback(on_error) result.addErrback(on_error)
yield yield result
return
class JSONRequestFailedTestCase(JSONBase): class JSONRequestFailedTestCase(JSONBase):