[Mod] 改名：将restful改名为network

tests/all_test.py

@@ -1,8 +1,8 @@
 import unittest
 
 # noinspection PyUnresolvedReferences
-from tests.restful.RestfulClientTest import *
-from tests.restful.WebSocketClientTest import *
+from tests.network.RestfulClientTest import *
+from tests.network.WebSocketClientTest import *
 
 if __name__ == "__main__":
     unittest.main()

tests/network/RestfulClientTest.py

@@ -1,15 +1,20 @@
 # encoding: UTF-8
 
 import json
-import traceback
 import unittest
 
+from simplejson import JSONDecodeError
+
 from Promise import Promise
-from vnpy.network.HttpClient import HttpClient, requestsSessionProvider
+from vnpy.network.HttpClient import HttpClient
+
+
+class FailedError(RuntimeError):
+    pass
 
 
 class TestHttpClient(HttpClient):
-    
+
     def __init__(self):
         urlBase = 'https://httpbin.org'
         super(TestHttpClient, self).__init__()
@@ -22,9 +27,11 @@ class TestHttpClient(HttpClient):
         return method, path, params, data, {'Content-Type': 'application/json'}
     
     def onError(self, exceptionType, exceptionValue, tb, req):
-        traceback.print_exception(exceptionType, exceptionValue, tb)
         self.p.set_exception(exceptionValue)
 
+    def onFailed(self, httpStatusCode, data, req):
+        self.p.set_exception(FailedError("request failed"))
+
 
 class RestfulClientTest(unittest.TestCase):
     
@@ -38,12 +45,9 @@ class RestfulClientTest(unittest.TestCase):
     def test_addReq_get(self):
         args = {'user': 'username',
                 'pw': 'password'}
-        
-        def callback(code, data, req):
-            if code == 200:
-                self.c.p.set_result(data['args'])
-                return
-            self.c.p.set_result(False)
+
+        def callback(data, req):
+            self.c.p.set_result(data['args'])
         
         self.c.addReq('GET', '/get', callback, params=args)
         res = self.c.p.get(3)
@@ -54,13 +58,27 @@ class RestfulClientTest(unittest.TestCase):
         body = {'user': 'username',
                 'pw': 'password'}
         
-        def callback(code, data, req):
-            if code == 200:
-                self.c.p.set_result(data['json'])
-                return
-            self.c.p.set_result(False)
+        def callback(data, req):
+            self.c.p.set_result(data['json'])
         
         self.c.addReq('POST', '/post', callback, data=body)
         res = self.c.p.get(3)
         
         self.assertEqual(body, res)
+        
+    def test_addReq_onFailed(self):
+        def callback(data, req):
+            pass
+        
+        self.c.addReq('POST', '/status/201', callback)
+        with self.assertRaises(FailedError):
+            self.c.p.get(3)
+
+    def test_addReq_jsonParseError(self):
+        def callback(data, req):
+            pass
+        
+        self.c.addReq('GET', '/image/svg', callback)
+        with self.assertRaises(JSONDecodeError):
+            self.c.p.get(3)
+