summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-02-05 16:26:51 +0000
committerGerrit Code Review <review@openstack.org>2016-02-05 16:26:51 +0000
commitce8dc18d4c5f6f979d78f3b2e6d64de01e9674e7 (patch)
tree0e725fc13e11b3a0bbaf90b4da3f1a7111d89cac
parent88482ab2a9a27fb664a1c95002077749136e548f (diff)
parent16f67160955c6e36001b880b3b6ae13e5a10d17d (diff)
downloadoslo-db-ce8dc18d4c5f6f979d78f3b2e6d64de01e9674e7.tar.gz
Merge "exception: fix DBInvalidUnicodeParameter error message"
-rw-r--r--oslo_db/exception.py5
-rw-r--r--oslo_db/tests/sqlalchemy/test_utils.py5
2 files changed, 8 insertions, 2 deletions
diff --git a/oslo_db/exception.py b/oslo_db/exception.py
index cca061c..7637a0d 100644
--- a/oslo_db/exception.py
+++ b/oslo_db/exception.py
@@ -147,8 +147,9 @@ class DBInvalidUnicodeParameter(Exception):
without encoding directive.
"""
- message = _("Invalid Parameter: "
- "Encoding directive wasn't provided.")
+ def __init__(self):
+ super(DBInvalidUnicodeParameter, self).__init__(
+ _("Invalid Parameter: Encoding directive wasn't provided."))
class DbMigrationError(DBError):
diff --git a/oslo_db/tests/sqlalchemy/test_utils.py b/oslo_db/tests/sqlalchemy/test_utils.py
index 6d48814..4593f6f 100644
--- a/oslo_db/tests/sqlalchemy/test_utils.py
+++ b/oslo_db/tests/sqlalchemy/test_utils.py
@@ -152,6 +152,11 @@ class TestPaginateQuery(test_base.BaseTestCase):
self.assertEqual("Sort key supplied is invalid: lol",
str(exception.InvalidSortKey("lol")))
+ def test_invalid_unicode_paramater_str(self):
+ self.assertEqual(
+ "Invalid Parameter: Encoding directive wasn't provided.",
+ str(exception.DBInvalidUnicodeParameter()))
+
def test_paginate_query_attribute_error(self):
sqlalchemy.asc(self.model.user_id).AndReturn('asc')
self.query.order_by('asc').AndReturn(self.query)