summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-02-05 05:44:55 +0000
committerGerrit Code Review <review@openstack.org>2016-02-05 05:44:55 +0000
commitd91811b905191edfee0785d65b254df86eb6d70f (patch)
tree4f2c01920507c5bf20ea67d7fcc9a1c304ba2da3
parent969f1617ae5cd20e4b7e82d55243c7a6acbec1c0 (diff)
parent06cbe4e70ae97de6db63d0caecadf3453a050a00 (diff)
downloadoslo-db-d91811b905191edfee0785d65b254df86eb6d70f.tar.gz
Merge "exception: fix InvalidSortKey message"
-rw-r--r--oslo_db/exception.py4
-rw-r--r--oslo_db/tests/sqlalchemy/test_utils.py4
2 files changed, 7 insertions, 1 deletions
diff --git a/oslo_db/exception.py b/oslo_db/exception.py
index 2b2df30..ffa0931 100644
--- a/oslo_db/exception.py
+++ b/oslo_db/exception.py
@@ -183,7 +183,9 @@ class DBDataError(DBError):
class InvalidSortKey(Exception):
"""A sort key destined for database query usage is invalid."""
- message = _("Sort key supplied was not valid.")
+ def __init__(self):
+ super(InvalidSortKey, self).__init__(
+ _("Sort key supplied was not valid."))
class ColumnError(Exception):
diff --git a/oslo_db/tests/sqlalchemy/test_utils.py b/oslo_db/tests/sqlalchemy/test_utils.py
index b7a00fb..2abda34 100644
--- a/oslo_db/tests/sqlalchemy/test_utils.py
+++ b/oslo_db/tests/sqlalchemy/test_utils.py
@@ -148,6 +148,10 @@ class TestPaginateQuery(test_base.BaseTestCase):
['user_id', 'project_id'],
sort_dirs=['asc', 'desc'])
+ def test_invalid_sort_key_str(self):
+ self.assertEqual("Sort key supplied was not valid.",
+ str(exception.InvalidSortKey()))
+
def test_paginate_query_attribute_error(self):
sqlalchemy.asc(self.model.user_id).AndReturn('asc')
self.query.order_by('asc').AndReturn(self.query)