diff options
| author | Davanum Srinivas <davanum@gmail.com> | 2016-02-06 11:40:47 -0500 |
|---|---|---|
| committer | Davanum Srinivas <davanum@gmail.com> | 2016-02-06 11:40:51 -0500 |
| commit | 9784b2c88c68b43bc9fb8432bda900b72e1e7936 (patch) | |
| tree | b24573543f8585ff2d034cb6981dd3a141939321 | |
| parent | ce8dc18d4c5f6f979d78f3b2e6d64de01e9674e7 (diff) | |
| download | oslo-db-9784b2c88c68b43bc9fb8432bda900b72e1e7936.tar.gz | |
InvalidSortKey constructor change breaks Heat unittests
Just supply a default value None, to avoid breaking projects
who currently use this exception.
Closes-Bug: #1542671
Change-Id: Ia397cab309aa22a2a86964f2ff90a796c878b2e7
| -rw-r--r-- | oslo_db/exception.py | 2 | ||||
| -rw-r--r-- | oslo_db/tests/sqlalchemy/test_utils.py | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/oslo_db/exception.py b/oslo_db/exception.py index 7637a0d..715bbc1 100644 --- a/oslo_db/exception.py +++ b/oslo_db/exception.py @@ -184,7 +184,7 @@ class DBDataError(DBError): class InvalidSortKey(Exception): """A sort key destined for database query usage is invalid.""" - def __init__(self, key): + def __init__(self, key=None): super(InvalidSortKey, self).__init__( _("Sort key supplied is invalid: %s") % key) self.key = key diff --git a/oslo_db/tests/sqlalchemy/test_utils.py b/oslo_db/tests/sqlalchemy/test_utils.py index 4593f6f..405619f 100644 --- a/oslo_db/tests/sqlalchemy/test_utils.py +++ b/oslo_db/tests/sqlalchemy/test_utils.py @@ -149,6 +149,8 @@ class TestPaginateQuery(test_base.BaseTestCase): sort_dirs=['asc', 'desc']) def test_invalid_sort_key_str(self): + self.assertEqual("Sort key supplied is invalid: None", + str(exception.InvalidSortKey())) self.assertEqual("Sort key supplied is invalid: lol", str(exception.InvalidSortKey("lol"))) |