projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix test broken by change of default behavior in arv-keepdocker. refs #8567
[arvados.git]
/
sdk
/
python
/
tests
/
test_arv_keepdocker.py
diff --git
a/sdk/python/tests/test_arv_keepdocker.py
b/sdk/python/tests/test_arv_keepdocker.py
index 151edf37757c901b22c226f232d98cc1d55a65b5..a25ad1660912b08ebc825d795ba7c23626be3d89 100644
(file)
--- a/
sdk/python/tests/test_arv_keepdocker.py
+++ b/
sdk/python/tests/test_arv_keepdocker.py
@@
-10,9
+10,11
@@
import subprocess
import sys
import tempfile
import unittest
import sys
import tempfile
import unittest
+import logging
import arvados.commands.keepdocker as arv_keepdocker
import arvados_testutil as tutil
import arvados.commands.keepdocker as arv_keepdocker
import arvados_testutil as tutil
+import run_test_server
class StopTest(Exception):
class StopTest(Exception):
@@
-20,20
+22,25
@@
class StopTest(Exception):
class ArvKeepdockerTestCase(unittest.TestCase):
class ArvKeepdockerTestCase(unittest.TestCase):
- def run_arv_keepdocker(self, args):
+ def run_arv_keepdocker(self, args
, err
):
sys.argv = ['arv-keepdocker'] + args
sys.argv = ['arv-keepdocker'] + args
- return arv_keepdocker.main()
+ log_handler = logging.StreamHandler(err)
+ arv_keepdocker.logger.addHandler(log_handler)
+ try:
+ return arv_keepdocker.main()
+ finally:
+ arv_keepdocker.logger.removeHandler(log_handler)
def test_unsupported_arg(self):
with self.assertRaises(SystemExit):
def test_unsupported_arg(self):
with self.assertRaises(SystemExit):
- self.run_arv_keepdocker(['-x=unknown'])
+ self.run_arv_keepdocker(['-x=unknown']
, sys.stderr
)
def test_version_argument(self):
err = io.BytesIO()
out = io.BytesIO()
with tutil.redirected_streams(stdout=out, stderr=err):
with self.assertRaises(SystemExit):
def test_version_argument(self):
err = io.BytesIO()
out = io.BytesIO()
with tutil.redirected_streams(stdout=out, stderr=err):
with self.assertRaises(SystemExit):
- self.run_arv_keepdocker(['--version'])
+ self.run_arv_keepdocker(['--version']
, sys.stderr
)
self.assertEqual(out.getvalue(), '')
self.assertRegexpMatches(err.getvalue(), "[0-9]+\.[0-9]+\.[0-9]+")
self.assertEqual(out.getvalue(), '')
self.assertRegexpMatches(err.getvalue(), "[0-9]+\.[0-9]+\.[0-9]+")
@@
-47,9
+54,9
@@
class ArvKeepdockerTestCase(unittest.TestCase):
for supported, img_id, expect_ok in [
(['v1'], old_id, True),
(['v1'], new_id, False),
for supported, img_id, expect_ok in [
(['v1'], old_id, True),
(['v1'], new_id, False),
- (None, old_id,
Tru
e),
- ([], old_id,
Tru
e),
- ([], new_id,
Tru
e),
+ (None, old_id,
Fals
e),
+ ([], old_id,
Fals
e),
+ ([], new_id,
Fals
e),
(['v1', 'v2'], new_id, True),
(['v1'], new_id, False),
(['v2'], new_id, True)]:
(['v1', 'v2'], new_id, True),
(['v1'], new_id, False),
(['v2'], new_id, True)]:
@@
-63,7
+70,7
@@
class ArvKeepdockerTestCase(unittest.TestCase):
err = io.BytesIO()
out = io.BytesIO()
err = io.BytesIO()
out = io.BytesIO()
- with tutil.redirected_streams(stdout=out
, stderr=err
), \
+ with tutil.redirected_streams(stdout=out), \
mock.patch('arvados.api') as api, \
mock.patch('arvados.commands.keepdocker.popen_docker',
return_value=subprocess.Popen(
mock.patch('arvados.api') as api, \
mock.patch('arvados.commands.keepdocker.popen_docker',
return_value=subprocess.Popen(
@@
-74,7
+81,7
@@
class ArvKeepdockerTestCase(unittest.TestCase):
self.assertRaises(StopTest if expect_ok else SystemExit):
api()._rootDesc = fakeDD
self.assertRaises(StopTest if expect_ok else SystemExit):
api()._rootDesc = fakeDD
- self.run_arv_keepdocker(['--force', 'testimage'])
+ self.run_arv_keepdocker(['--force', 'testimage']
, err
)
self.assertEqual(out.getvalue(), '')
if expect_ok:
self.assertEqual(out.getvalue(), '')
if expect_ok:
@@
-95,7
+102,7
@@
class ArvKeepdockerTestCase(unittest.TestCase):
fakeDD['dockerImageFormats'] = ['v1']
err = io.BytesIO()
out = io.BytesIO()
fakeDD['dockerImageFormats'] = ['v1']
err = io.BytesIO()
out = io.BytesIO()
- with tutil.redirected_streams(stdout=out
, stderr=err
), \
+ with tutil.redirected_streams(stdout=out), \
mock.patch('arvados.api') as api, \
mock.patch('arvados.commands.keepdocker.popen_docker',
return_value=subprocess.Popen(
mock.patch('arvados.api') as api, \
mock.patch('arvados.commands.keepdocker.popen_docker',
return_value=subprocess.Popen(
@@
-106,5
+113,5
@@
class ArvKeepdockerTestCase(unittest.TestCase):
self.assertRaises(StopTest):
api()._rootDesc = fakeDD
self.run_arv_keepdocker(
self.assertRaises(StopTest):
api()._rootDesc = fakeDD
self.run_arv_keepdocker(
- ['--force', '--force-image-format', 'testimage'])
+ ['--force', '--force-image-format', 'testimage']
, err
)
self.assertRegexpMatches(err.getvalue(), "forcing incompatible image")
self.assertRegexpMatches(err.getvalue(), "forcing incompatible image")