projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
11502: Merge branch 'master' into 11502-unstripped-manifest-fix
[arvados.git]
/
sdk
/
python
/
tests
/
test_arv_ls.py
diff --git
a/sdk/python/tests/test_arv_ls.py
b/sdk/python/tests/test_arv_ls.py
index 5064f07d722ee77efc0c8a4f733eaf86d02b8b39..99b551082f8c7399500e9b71f3338050f33fea02 100644
(file)
--- a/
sdk/python/tests/test_arv_ls.py
+++ b/
sdk/python/tests/test_arv_ls.py
@@
-35,10
+35,10
@@
class ArvLsTestCase(run_test_server.TestCaseWithServers):
api_client.collections().get().execute.return_value = coll_info
return coll_info, api_client
api_client.collections().get().execute.return_value = coll_info
return coll_info, api_client
- def run_ls(self, args, api_client):
+ def run_ls(self, args, api_client
, logger=None
):
self.stdout = io.BytesIO()
self.stderr = io.BytesIO()
self.stdout = io.BytesIO()
self.stderr = io.BytesIO()
- return arv_ls.main(args, self.stdout, self.stderr, api_client)
+ return arv_ls.main(args, self.stdout, self.stderr, api_client
, logger
)
def test_plain_listing(self):
collection, api_client = self.mock_api_for_manifest(
def test_plain_listing(self):
collection, api_client = self.mock_api_for_manifest(
@@
-76,10
+76,13
@@
class ArvLsTestCase(run_test_server.TestCaseWithServers):
def test_locator_failure(self):
api_client = mock.MagicMock(name='mock_api_client')
def test_locator_failure(self):
api_client = mock.MagicMock(name='mock_api_client')
+ error_mock = mock.MagicMock()
+ logger = mock.MagicMock()
+ logger.error = error_mock
api_client.collections().get().execute.side_effect = (
arv_error.NotFoundError)
api_client.collections().get().execute.side_effect = (
arv_error.NotFoundError)
- self.assertNotEqual(0, self.run_ls([self.FAKE_UUID], api_client))
- self.assert
NotEqual('', self.stderr.getvalue()
)
+ self.assertNotEqual(0, self.run_ls([self.FAKE_UUID], api_client
, logger
))
+ self.assert
Equal(1, error_mock.call_count
)
def test_version_argument(self):
err = io.BytesIO()
def test_version_argument(self):
err = io.BytesIO()