projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
6218: update the exception handling.
[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 b4e97f6e5a062a7b9232e6ed2dce0fc6b1ea0e30..6e2a07888662172fd6f26b335a0206db4ef15e98 100644
(file)
--- a/
sdk/python/tests/arvados_testutil.py
+++ b/
sdk/python/tests/arvados_testutil.py
@@
-63,7
+63,7
@@
class FakeCurl:
def setopt(self, opt, val):
self._opt[str(opt)] = val
def setopt(self, opt, val):
self._opt[str(opt)] = val
- if opt == pycurl.WRITE
DATA
:
+ if opt == pycurl.WRITE
FUNCTION
:
self._writer = val
elif opt == pycurl.HEADERFUNCTION:
self._headerfunction = val
self._writer = val
elif opt == pycurl.HEADERFUNCTION:
self._headerfunction = val
@@
-79,7
+79,7
@@
class FakeCurl:
self._headerfunction("HTTP/1.1 {} Status".format(self._resp_code))
for k, v in self._resp_headers.iteritems():
self._headerfunction(k + ': ' + str(v))
self._headerfunction("HTTP/1.1 {} Status".format(self._resp_code))
for k, v in self._resp_headers.iteritems():
self._headerfunction(k + ': ' + str(v))
- self._writer
.write
(self._resp_body)
+ self._writer(self._resp_body)
def close(self):
pass
def close(self):
pass
@@
-141,7
+141,8
@@
class ApiClientMock(object):
service_host=None,
service_port=None,
service_ssl_flag=False,
service_host=None,
service_port=None,
service_ssl_flag=False,
- additional_services=[]):
+ additional_services=[],
+ read_only=False):
if api_mock is None:
api_mock = self.api_client_mock()
body = {
if api_mock is None:
api_mock = self.api_client_mock()
body = {
@@
-153,6
+154,7
@@
class ApiClientMock(object):
'service_port': service_port or 65535-i,
'service_ssl_flag': service_ssl_flag,
'service_type': service_type,
'service_port': service_port or 65535-i,
'service_ssl_flag': service_ssl_flag,
'service_type': service_type,
+ 'read_only': read_only,
} for i in range(0, count)] + additional_services
}
self._mock_api_call(api_mock.keep_services().accessible, status, body)
} for i in range(0, count)] + additional_services
}
self._mock_api_call(api_mock.keep_services().accessible, status, body)