projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
18003: Merge branch 'main' into 18003-support-exists-contains-in-filter-groups
[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 99b551082f8c7399500e9b71f3338050f33fea02..635c6254ad73f9c8d8178634c0ce33c0b038b0d0 100644
(file)
--- a/
sdk/python/tests/test_arv_ls.py
+++ b/
sdk/python/tests/test_arv_ls.py
@@
-1,7
+1,10
@@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
+# Copyright (C) The Arvados Authors. All rights reserved.
+#
+# SPDX-License-Identifier: Apache-2.0
-import io
+from __future__ import absolute_import
+from builtins import str
+from builtins import range
import os
import random
import sys
import os
import random
import sys
@@
-10,11
+13,12
@@
import tempfile
import arvados.errors as arv_error
import arvados.commands.ls as arv_ls
import arvados.errors as arv_error
import arvados.commands.ls as arv_ls
-import run_test_server
+
from .
import run_test_server
-from arvados_testutil import str_keep_locator, redirected_streams
+from . import arvados_testutil as tutil
+from .arvados_testutil import str_keep_locator, redirected_streams, StringIO
-class ArvLsTestCase(run_test_server.TestCaseWithServers):
+class ArvLsTestCase(run_test_server.TestCaseWithServers
, tutil.VersionChecker
):
FAKE_UUID = 'zzzzz-4zz18-12345abcde12345'
def newline_join(self, seq):
FAKE_UUID = 'zzzzz-4zz18-12345abcde12345'
def newline_join(self, seq):
@@
-36,8
+40,8
@@
class ArvLsTestCase(run_test_server.TestCaseWithServers):
return coll_info, api_client
def run_ls(self, args, api_client, logger=None):
return coll_info, api_client
def run_ls(self, args, api_client, logger=None):
- self.stdout =
io.Bytes
IO()
- self.stderr =
io.Bytes
IO()
+ self.stdout =
String
IO()
+ self.stderr =
String
IO()
return arv_ls.main(args, self.stdout, self.stderr, api_client, logger)
def test_plain_listing(self):
return arv_ls.main(args, self.stdout, self.stderr, api_client, logger)
def test_plain_listing(self):
@@
-85,10
+89,10
@@
class ArvLsTestCase(run_test_server.TestCaseWithServers):
self.assertEqual(1, error_mock.call_count)
def test_version_argument(self):
self.assertEqual(1, error_mock.call_count)
def test_version_argument(self):
- err = io.BytesIO()
- out = io.BytesIO()
- with redirected_streams(stdout=out, stderr=err):
+ if sys.version_info >= (3, 0):
+ import warnings
+ warnings.simplefilter("ignore")
+ with redirected_streams(stdout=StringIO, stderr=StringIO) as (out, err):
with self.assertRaises(SystemExit):
self.run_ls(['--version'], None)
with self.assertRaises(SystemExit):
self.run_ls(['--version'], None)
- self.assertEqual(out.getvalue(), '')
- self.assertRegexpMatches(err.getvalue(), "[0-9]+\.[0-9]+\.[0-9]+")
+ self.assertVersionOutput(out, err)