projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
5827: check readable only attrvalue is a string
[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 49ed79cc4570f4e0915392ba9774df26e39cf5e5..a10802ae81b7b2bf439f8452052a0ba1e9643617 100644
(file)
--- a/
sdk/python/tests/arvados_testutil.py
+++ b/
sdk/python/tests/arvados_testutil.py
@@
-94,9
+94,6
@@
class MockStreamReader(object):
return self._name
def readfrom(self, start, size, num_retries=None):
return self._name
def readfrom(self, start, size, num_retries=None):
- self._readfrom(start, size, num_retries=num_retries)
-
- def _readfrom(self, start, size, num_retries=None):
return self._data[start:start + size]
class ApiClientMock(object):
return self._data[start:start + size]
class ApiClientMock(object):
@@
-107,7
+104,8
@@
class ApiClientMock(object):
service_type='disk',
service_host=None,
service_port=None,
service_type='disk',
service_host=None,
service_port=None,
- service_ssl_flag=False):
+ service_ssl_flag=False,
+ additional_services=[]):
if api_mock is None:
api_mock = self.api_client_mock()
body = {
if api_mock is None:
api_mock = self.api_client_mock()
body = {
@@
-119,7
+117,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,
- } for i in range(0, count)]
+ } for i in range(0, count)]
+ additional_services
}
self._mock_api_call(api_mock.keep_services().accessible, status, body)
return api_mock
}
self._mock_api_call(api_mock.keep_services().accessible, status, body)
return api_mock