summaryrefslogtreecommitdiffstats
path: root/newton/newton/requests/tests
diff options
context:
space:
mode:
Diffstat (limited to 'newton/newton/requests/tests')
-rw-r--r--newton/newton/requests/tests/test_base.py31
-rw-r--r--newton/newton/requests/tests/test_server.py1
2 files changed, 15 insertions, 17 deletions
diff --git a/newton/newton/requests/tests/test_base.py b/newton/newton/requests/tests/test_base.py
index 3e6b59c3..06f610cb 100644
--- a/newton/newton/requests/tests/test_base.py
+++ b/newton/newton/requests/tests/test_base.py
@@ -31,23 +31,20 @@ def get_mock_session(http_actions, response_dict={}):
mock_session = mock.Mock(
name='mock_session',spec=http_actions)
for action in http_actions:
- mock_response_obj = mock.Mock(spec=MockResponse)
- mock_response_obj.content = response_dict.get(
- action).get("content")
- mock_response_obj.json.return_value = response_dict.get(
- action).get("content")
- mock_response_obj.status_code = response_dict.get(
- action).get("status_code", status.HTTP_200_OK)
- if action == "get":
- mock_session.get.return_value = mock_response_obj
- if action == "post":
- mock_session.post.return_value = mock_response_obj
- if action == "put":
- mock_session.put.return_value = mock_response_obj
- if action == "delete":
- mock_session.delete.return_value = mock_response_obj
- if action == "head":
- mock_session.head.return_value = mock_response_obj
+ side_effect = response_dict.get("side_effect")
+ if side_effect and isinstance(side_effect, list):
+ mock_session.__getattr__(action).__setattr__(
+ "side_effect", side_effect)
+ else:
+ mock_response_obj = mock.Mock(spec=MockResponse)
+ mock_response_obj.content = response_dict.get(
+ action).get("content")
+ mock_response_obj.json.return_value = response_dict.get(
+ action).get("content")
+ mock_response_obj.status_code = response_dict.get(
+ action).get("status_code", status.HTTP_200_OK)
+ mock_session.__getattr__(action).__setattr__(
+ "return_value", mock_response_obj)
return mock_session
diff --git a/newton/newton/requests/tests/test_server.py b/newton/newton/requests/tests/test_server.py
index c3e9e0f6..b5e6e3fe 100644
--- a/newton/newton/requests/tests/test_server.py
+++ b/newton/newton/requests/tests/test_server.py
@@ -84,6 +84,7 @@ MOCK_POST_SERVER_CREATED_THREAD_RESPONSE = {
}
}
+
class TestNetwork(test_base.TestRequest):
@mock.patch.object(VimDriverUtils, 'get_vim_info')