projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
16636: Merge branch 'master' into 16636-more-metrics
[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 c70ecd488c96b77cc5b252bc2cca123675f782c3..f251ea654b5fed6d0c5f9c837c720aa733b02baf 100644
(file)
--- a/
sdk/python/tests/arvados_testutil.py
+++ b/
sdk/python/tests/arvados_testutil.py
@@
-1,4
+1,6
@@
-#!/usr/bin/env python
+# Copyright (C) The Arvados Authors. All rights reserved.
+#
+# SPDX-License-Identifier: Apache-2.0
from future import standard_library
standard_library.install_aliases()
from future import standard_library
standard_library.install_aliases()
@@
-22,9
+24,10
@@
import tempfile
import unittest
if sys.version_info >= (3, 0):
import unittest
if sys.version_info >= (3, 0):
- from io import StringIO
+ from io import StringIO
, BytesIO
else:
from cStringIO import StringIO
else:
from cStringIO import StringIO
+ BytesIO = StringIO
# Use this hostname when you want to make sure the traffic will be
# instantly refused. 100::/64 is a dedicated black hole.
# Use this hostname when you want to make sure the traffic will be
# instantly refused. 100::/64 is a dedicated black hole.
@@
-90,7
+93,7
@@
class VersionChecker(object):
# Python 2 writes version info on stderr.
self.assertEqual(out.getvalue(), '')
v = err.getvalue()
# Python 2 writes version info on stderr.
self.assertEqual(out.getvalue(), '')
v = err.getvalue()
- self.assertRegex(v, r"[0-9]+\.[0-9]+\.[0-9]+$\n")
+ self.assertRegex(v, r"[0-9]+\.[0-9]+\.[0-9]+
(\.dev[0-9]+)?
$\n")
class FakeCurl(object):
class FakeCurl(object):