From 710b61313665939d2ddb662e9dd8a16177eac735 Mon Sep 17 00:00:00 2001 From: wangqi Date: Mon, 23 Apr 2018 02:21:27 +0000 Subject: [PATCH] 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 --- qinling/tests/unit/engine/test_default_engine.py | 2 +- qinling/tests/unit/storage/test_file_system.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/qinling/tests/unit/engine/test_default_engine.py b/qinling/tests/unit/engine/test_default_engine.py index f5a7e781..4ef5b85f 100644 --- a/qinling/tests/unit/engine/test_default_engine.py +++ b/qinling/tests/unit/engine/test_default_engine.py @@ -70,7 +70,7 @@ class TestDefaultEngine(base.DbTestCase): self.orchestrator.delete_pool.assert_called_once_with( runtime_id) - self.assertRaisesRegexp( + self.assertRaisesRegex( exc.DBEntityNotFoundError, "^Runtime not found \[id=%s\]$" % runtime_id, db_api.get_runtime, runtime_id) diff --git a/qinling/tests/unit/storage/test_file_system.py b/qinling/tests/unit/storage/test_file_system.py index eb9f8080..80e60402 100644 --- a/qinling/tests/unit/storage/test_file_system.py +++ b/qinling/tests/unit/storage/test_file_system.py @@ -72,7 +72,7 @@ class TestFileSystemStorage(base.BaseTest): function_data = "Some data".encode('utf8') not_a_md5sum = "Not a md5sum" - self.assertRaisesRegexp( + self.assertRaisesRegex( exc.InputException, "^Package md5 mismatch\.$", self.storage.store, @@ -96,7 +96,7 @@ class TestFileSystemStorage(base.BaseTest): # For python3, data should be encoded into bytes before hashing. function_data = "Some data".encode('utf8') - self.assertRaisesRegexp( + self.assertRaisesRegex( exc.InputException, "^Package is not a valid ZIP package\.$", self.storage.store, @@ -133,7 +133,7 @@ class TestFileSystemStorage(base.BaseTest): exists_mock.return_value = False function = self.rand_name('function', prefix='TestFileSystemStorage') - self.assertRaisesRegexp( + self.assertRaisesRegex( exc.StorageNotFoundException, "^Package of function %s for project %s not found\.$" % ( function, self.project_id),