projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
11789: Added '--excluded <pattern>' argument so that files and/or directories can...
[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 16348031efabf070a24c55a375830469c9390b92..358752a74de65b9c5d7911eea9b20be8a271666b 100644
(file)
--- a/
sdk/python/tests/test_arv_keepdocker.py
+++ b/
sdk/python/tests/test_arv_keepdocker.py
@@
-1,6
+1,3
@@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-
from __future__ import absolute_import
import arvados
import hashlib
from __future__ import absolute_import
import arvados
import hashlib
@@
-83,15
+80,15
@@
class ArvKeepdockerTestCase(unittest.TestCase, tutil.VersionChecker):
self.assertEqual(out.getvalue(), '')
if expect_ok:
self.assertEqual(out.getvalue(), '')
if expect_ok:
- self.assertNotRegex
pMatches
(
+ self.assertNotRegex(
err.getvalue(), "refusing to store",
msg=repr((supported, img_id)))
else:
err.getvalue(), "refusing to store",
msg=repr((supported, img_id)))
else:
- self.assertRegex
pMatches
(
+ self.assertRegex(
err.getvalue(), "refusing to store",
msg=repr((supported, img_id)))
if not supported:
err.getvalue(), "refusing to store",
msg=repr((supported, img_id)))
if not supported:
- self.assertRegex
pMatches
(
+ self.assertRegex(
err.getvalue(),
"server does not specify supported image formats",
msg=repr((supported, img_id)))
err.getvalue(),
"server does not specify supported image formats",
msg=repr((supported, img_id)))
@@
-112,4
+109,4
@@
class ArvKeepdockerTestCase(unittest.TestCase, tutil.VersionChecker):
api()._rootDesc = fakeDD
self.run_arv_keepdocker(
['--force', '--force-image-format', 'testimage'], err)
api()._rootDesc = fakeDD
self.run_arv_keepdocker(
['--force', '--force-image-format', 'testimage'], err)
- self.assertRegex
pMatches
(err.getvalue(), "forcing incompatible image")
+ self.assertRegex(err.getvalue(), "forcing incompatible image")