Replace assertRaisesRegexp with assertRaisesRegex
qinling don't use the unittest module directly, but using unittest2 instead assertRaisesRegexp is deprecated in unittest2 by assertRaisesRegex, see: https://hg.python.org/unittest2/rev/27d6829cd8fa#l1.213 Change-Id: I255e2c0453e76d6cb4dd2832d723b6c35241ca9d
This commit is contained in:
parent
1429048e15
commit
710b613136
@ -70,7 +70,7 @@ class TestDefaultEngine(base.DbTestCase):
|
|||||||
|
|
||||||
self.orchestrator.delete_pool.assert_called_once_with(
|
self.orchestrator.delete_pool.assert_called_once_with(
|
||||||
runtime_id)
|
runtime_id)
|
||||||
self.assertRaisesRegexp(
|
self.assertRaisesRegex(
|
||||||
exc.DBEntityNotFoundError,
|
exc.DBEntityNotFoundError,
|
||||||
"^Runtime not found \[id=%s\]$" % runtime_id,
|
"^Runtime not found \[id=%s\]$" % runtime_id,
|
||||||
db_api.get_runtime, runtime_id)
|
db_api.get_runtime, runtime_id)
|
||||||
|
@ -72,7 +72,7 @@ class TestFileSystemStorage(base.BaseTest):
|
|||||||
function_data = "Some data".encode('utf8')
|
function_data = "Some data".encode('utf8')
|
||||||
not_a_md5sum = "Not a md5sum"
|
not_a_md5sum = "Not a md5sum"
|
||||||
|
|
||||||
self.assertRaisesRegexp(
|
self.assertRaisesRegex(
|
||||||
exc.InputException,
|
exc.InputException,
|
||||||
"^Package md5 mismatch\.$",
|
"^Package md5 mismatch\.$",
|
||||||
self.storage.store,
|
self.storage.store,
|
||||||
@ -96,7 +96,7 @@ class TestFileSystemStorage(base.BaseTest):
|
|||||||
# For python3, data should be encoded into bytes before hashing.
|
# For python3, data should be encoded into bytes before hashing.
|
||||||
function_data = "Some data".encode('utf8')
|
function_data = "Some data".encode('utf8')
|
||||||
|
|
||||||
self.assertRaisesRegexp(
|
self.assertRaisesRegex(
|
||||||
exc.InputException,
|
exc.InputException,
|
||||||
"^Package is not a valid ZIP package\.$",
|
"^Package is not a valid ZIP package\.$",
|
||||||
self.storage.store,
|
self.storage.store,
|
||||||
@ -133,7 +133,7 @@ class TestFileSystemStorage(base.BaseTest):
|
|||||||
exists_mock.return_value = False
|
exists_mock.return_value = False
|
||||||
function = self.rand_name('function', prefix='TestFileSystemStorage')
|
function = self.rand_name('function', prefix='TestFileSystemStorage')
|
||||||
|
|
||||||
self.assertRaisesRegexp(
|
self.assertRaisesRegex(
|
||||||
exc.StorageNotFoundException,
|
exc.StorageNotFoundException,
|
||||||
"^Package of function %s for project %s not found\.$" % (
|
"^Package of function %s for project %s not found\.$" % (
|
||||||
function, self.project_id),
|
function, self.project_id),
|
||||||
|
Loading…
Reference in New Issue
Block a user