projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
20257: Mark functions and classes internal not intended for use
[arvados.git]
/
sdk
/
python
/
tests
/
test_arv_ws.py
diff --git
a/sdk/python/tests/test_arv_ws.py
b/sdk/python/tests/test_arv_ws.py
index 2a85e04e87c06067bd7d83773295cf049f747852..521c46ee34e72df4c25fc3a7f0dcbe2cdce379b6 100644
(file)
--- a/
sdk/python/tests/test_arv_ws.py
+++ b/
sdk/python/tests/test_arv_ws.py
@@
-1,6
+1,8
@@
-#!/usr/bin/env python
+# Copyright (C) The Arvados Authors. All rights reserved.
+#
+# SPDX-License-Identifier: Apache-2.0
-import io
+from __future__ import absolute_import
import os
import sys
import tempfile
import os
import sys
import tempfile
@@
-8,9
+10,9
@@
import unittest
import arvados.errors as arv_error
import arvados.commands.ws as arv_ws
import arvados.errors as arv_error
import arvados.commands.ws as arv_ws
-import arvados_testutil as tutil
+
from .
import arvados_testutil as tutil
-class ArvWsTestCase(unittest.TestCase):
+class ArvWsTestCase(unittest.TestCase
, tutil.VersionChecker
):
def run_ws(self, args):
return arv_ws.main(args)
def run_ws(self, args):
return arv_ws.main(args)
@@
-19,10
+21,8
@@
class ArvWsTestCase(unittest.TestCase):
self.run_ws(['-x=unknown'])
def test_version_argument(self):
self.run_ws(['-x=unknown'])
def test_version_argument(self):
- err = io.BytesIO()
- out = io.BytesIO()
- with tutil.redirected_streams(stdout=out, stderr=err):
+ with tutil.redirected_streams(
+ stdout=tutil.StringIO, stderr=tutil.StringIO) as (out, err):
with self.assertRaises(SystemExit):
self.run_ws(['--version'])
with self.assertRaises(SystemExit):
self.run_ws(['--version'])
- self.assertEqual(out.getvalue(), '')
- self.assertRegexpMatches(err.getvalue(), "[0-9]+\.[0-9]+\.[0-9]+")
+ self.assertVersionOutput(out, err)