summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2017-12-04 16:28:27 +0000
committerGerrit Code Review <review@openstack.org>2017-12-04 16:28:27 +0000
commit6d6e706ac19fe25c0a02db939ec179dabbd00755 (patch)
tree96cd6b531c62fbd197ac625867894ee4d44e4b59
parent1c43d0689cb6f386eb9dafec764c8221ad63c042 (diff)
parent74638747cef5f25989d52dad8f72673a60caa83c (diff)
downloadoslo-db-6d6e706ac19fe25c0a02db939ec179dabbd00755.tar.gz
Merge "Use assertRegex instead of assertRegexpMatches"
-rw-r--r--oslo_db/tests/sqlalchemy/test_enginefacade.py12
1 files changed, 6 insertions, 6 deletions
diff --git a/oslo_db/tests/sqlalchemy/test_enginefacade.py b/oslo_db/tests/sqlalchemy/test_enginefacade.py
index 7a7484f..8b782a3 100644
--- a/oslo_db/tests/sqlalchemy/test_enginefacade.py
+++ b/oslo_db/tests/sqlalchemy/test_enginefacade.py
@@ -926,7 +926,7 @@ class MockFacadeTest(oslo_test_base.BaseTestCase):
getattr, context, 'session'
)
- self.assertRegexpMatches(
+ self.assertRegex(
exc.args[0],
"The 'session' context attribute was requested but it has "
"not been established for this context."
@@ -941,7 +941,7 @@ class MockFacadeTest(oslo_test_base.BaseTestCase):
getattr, context, 'connection'
)
- self.assertRegexpMatches(
+ self.assertRegex(
exc.args[0],
"The 'connection' context attribute was requested but it has "
"not been established for this context."
@@ -954,7 +954,7 @@ class MockFacadeTest(oslo_test_base.BaseTestCase):
getattr, context, 'session'
)
- self.assertRegexpMatches(
+ self.assertRegex(
exc.args[0],
"No TransactionContext is established for "
"this .*RequestContext.* object within the current "
@@ -972,7 +972,7 @@ class MockFacadeTest(oslo_test_base.BaseTestCase):
getattr, context, 'connection'
)
- self.assertRegexpMatches(
+ self.assertRegex(
exc.args[0],
"No TransactionContext is established for "
"this .*RequestContext.* object within the current "
@@ -990,7 +990,7 @@ class MockFacadeTest(oslo_test_base.BaseTestCase):
getattr, context, 'transaction'
)
- self.assertRegexpMatches(
+ self.assertRegex(
exc.args[0],
"No TransactionContext is established for "
"this .*RequestContext.* object within the current "
@@ -1008,7 +1008,7 @@ class MockFacadeTest(oslo_test_base.BaseTestCase):
getattr, context, 'transaction_ctx'
)
- self.assertRegexpMatches(
+ self.assertRegex(
exc.args[0],
"No TransactionContext is established for "
"this .*RequestContext.* object within the current "