Fix ignored tests to pass

docs/tabpy-tools.md

@@ -188,7 +188,7 @@ For every successfully deployed model a message will be printed to the console:
 ```
 
 Use code in [`tabpy/models/scripts`](../tabpy/models/scripts)
-as an example how to create a model and
+as an example of how to create a model and
 [`tabpy/models/deploy_models.py`](../tabpy/models/deploy_models.py)
 as an example for how to deploy a model. For deployment script include all
 necessary packages when installing dependencies or alternatively install

tabpy/tabpy_tools/rest.py

@@ -84,15 +84,18 @@ def GET(self, url, data, timeout=None):
         self._remove_nones(data)
 
         logger.info(f'GET {url} with {data}')
+        print(f'GET {url} with {data}')
 
         response = self.session.get(
             url,
             params=data,
             timeout=timeout,
             auth=self.auth)
+        print(f'status_code={response.status_code}')
         if response.status_code != 200:
             self.raise_error(response)
         logger.info(f'response={response.text}')
+        print(f'response={str(response.text)}')
 
         if response.text == '':
             return dict()

tests/unit/tools_tests/test_rest.py

@@ -1,11 +1,10 @@
 import json
 import requests
+from requests.auth import HTTPBasicAuth
 import sys
+from tabpy.tabpy_tools.rest import (RequestsNetworkWrapper, ServiceClient)
 import unittest
 from unittest.mock import Mock
-from requests.auth import HTTPBasicAuth
-
-from tabpy.tabpy_tools.rest import (RequestsNetworkWrapper, ServiceClient)
 
 
 class TestRequestsNetworkWrapper(unittest.TestCase):
@@ -20,19 +19,19 @@ def test_init_with_session(self):
 
         self.assertIs(session, rnw.session)
 
-    def setUp(self):
-        def mock_response(status_code):
-            response = Mock(requests.Response())
-            response.json.return_value = 'json'
-            response.status_code = status_code
+    def mock_response(self, status_code):
+        response = Mock(requests.Response())
+        response.json.return_value = 'json'
+        response.status_code = status_code
 
-            return response
+        return response
 
+    def setUp(self):
         session = Mock(requests.session())
-        session.get.return_value = mock_response(200)
-        session.post.return_value = mock_response(200)
-        session.put.return_value = mock_response(200)
-        session.delete.return_value = mock_response(204)
+        session.get.return_value = self.mock_response(200)
+        session.post.return_value = self.mock_response(200)
+        session.put.return_value = self.mock_response(200)
+        session.delete.return_value = self.mock_response(204)
 
         self.rnw = RequestsNetworkWrapper(session=session)
 
@@ -46,18 +45,18 @@ def test_GET(self):
             timeout=None,
             auth=None)
 
-    @unittest.expectedFailure
     def test_GET_InvalidData(self):
         url = 'abc'
         data = {'cat'}
         with self.assertRaises(TypeError):
+            self.rnw.session.get.return_value = self.mock_response(404)
             self.rnw.GET(url, data)
 
-    @unittest.expectedFailure
     def test_GET_InvalidURL(self):
         url = ''
         data = {'foo': 'bar'}
         with self.assertRaises(TypeError):
+            self.rnw.session.get.return_value = self.mock_response(404)
             self.rnw.GET(url, data)
 
     def test_POST(self):
@@ -70,11 +69,11 @@ def test_POST(self):
             timeout=None,
             auth=None)
 
-    @unittest.expectedFailure
     def test_POST_InvalidURL(self):
         url = ''
         data = {'foo': 'bar'}
         with self.assertRaises(TypeError):
+            self.rnw.session.post.return_value = self.mock_response(404)
             self.rnw.POST(url, data)
 
     def test_POST_InvalidData(self):