projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into 9587-trash-page
[arvados.git]
/
sdk
/
python
/
tests
/
test_arv_normalize.py
diff --git
a/sdk/python/tests/test_arv_normalize.py
b/sdk/python/tests/test_arv_normalize.py
index 8bce7e3860ad3dc90864806ae513197e24249e1a..4357ee296adb2f99da63872dc3ae59ccdf77fd63 100644
(file)
--- a/
sdk/python/tests/test_arv_normalize.py
+++ b/
sdk/python/tests/test_arv_normalize.py
@@
-1,27
+1,30
@@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-
import subprocess
import sys
import tempfile
import unittest
import subprocess
import sys
import tempfile
import unittest
+from . import arvados_testutil as tutil
+
-class ArvNormalizeTestCase(unittest.TestCase):
+class ArvNormalizeTestCase(unittest.TestCase
, tutil.VersionChecker
):
def run_arv_normalize(self, args=[]):
p = subprocess.Popen([sys.executable, 'bin/arv-normalize'] + args,
stdout=subprocess.PIPE,
stderr=subprocess.PIPE)
def run_arv_normalize(self, args=[]):
p = subprocess.Popen([sys.executable, 'bin/arv-normalize'] + args,
stdout=subprocess.PIPE,
stderr=subprocess.PIPE)
- (stdout, stderr) = p.communicate()
- return p.returncode, stdout, stderr
+ out, err = p.communicate()
+ sys.stdout.write(out.decode())
+ sys.stderr.write(err.decode())
+ return p.returncode
def test_unsupported_arg(self):
def test_unsupported_arg(self):
- returncode, out, err = self.run_arv_normalize(['-x=unknown'])
+ with tutil.redirected_streams(
+ stdout=tutil.StringIO, stderr=tutil.StringIO) as (out, err):
+ returncode = self.run_arv_normalize(['-x=unknown'])
self.assertNotEqual(0, returncode)
def test_version_argument(self):
self.assertNotEqual(0, returncode)
def test_version_argument(self):
- returncode, out, err = self.run_arv_normalize(['--version'])
+ with tutil.redirected_streams(
+ stdout=tutil.StringIO, stderr=tutil.StringIO) as (out, err):
+ returncode = self.run_arv_normalize(['--version'])
+ self.assertVersionOutput(out, err)
self.assertEqual(0, returncode)
self.assertEqual(0, returncode)
- self.assertEqual('', out)
- self.assertNotEqual('', err)
- self.assertRegexpMatches(err, "[0-9]+\.[0-9]+\.[0-9]+")