4823: Working on porting more StreamReader tests to ArvadosFile.

[arvados.git] / sdk / python / tests / arvados_testutil.py

diff --git a/sdk/python/tests/arvados_testutil.py b/sdk/python/tests/arvados_testutil.py
index 5d58ea85be9ecf7cccdee982231dfc33494e673b..474c068b85d4eb05af274f381f0eb6be5a0789dd 100644 (file)
--- a/sdk/python/tests/arvados_testutil.py
+++ b/sdk/python/tests/arvados_testutil.py
@@ -39,35 +39,30 @@ def fake_requests_response(code, body, **headers):
     r.raw = io.BytesIO(body)
     return r
 
-class MockSession(object):
-    def __init__(self, body, codes, headers):
-        if isinstance(body, list):
-            self.body = body
-        else:
-            self.body = [body for c in codes]
-        self.codes = codes
-        self.headers = headers
-        self.n = -1
-
-    def get(self, url, **kwargs):
-        self.n += 1
-        return fake_requests_response(self.codes[self.n], self.body[self.n], **self.headers)
-
-    def put(self, url, **kwargs):
-        self.n += 1
-        return fake_requests_response(self.codes[self.n], self.body[self.n], **self.headers)
-
-# def mock_get_responses(body, *codes, **headers):
-#     return mock.patch('requests.get', side_effect=(
-#         fake_requests_response(code, body, **headers) for code in codes))
-
-# def mock_put_responses(body, *codes, **headers):
-#     return mock.patch('requests.put', side_effect=(
-#         fake_requests_response(code, body, **headers) for code in codes))
-
-def mock_requestslib_responses(method, body, *codes, **headers):
-    return mock.patch(method, side_effect=(
-        fake_requests_response(code, body, **headers) for code in codes))
+def mock_put_responses(body, *codes, **headers):
+    m = mock.MagicMock()
+    if isinstance(body, tuple):
+        codes = list(codes)
+        codes.insert(0, body)
+        m.return_value.put.side_effect = (fake_requests_response(code, b, **headers) for b, code in codes)
+    else:
+        m.return_value.put.side_effect = (fake_requests_response(code, body, **headers) for code in codes)
+    return mock.patch('requests.Session', m)
+
+def mock_get_responses(body, *codes, **headers):
+    m = mock.MagicMock()
+    m.return_value.get.side_effect = (fake_requests_response(code, body, **headers) for code in codes)
+    return mock.patch('requests.Session', m)
+
+def mock_get(side_effect):
+    m = mock.MagicMock()
+    m.return_value.get.side_effect = side_effect
+    return mock.patch('requests.Session', m)
+
+def mock_put(side_effect):
+    m = mock.MagicMock()
+    m.return_value.put.side_effect = side_effect
+    return mock.patch('requests.Session', m)
 
 class MockStreamReader(object):
     def __init__(self, name='.', *data):