Merge "Add support for custom JSON serializer"

2016-05-19 16:18:54 +00:00
parent 663092d675 4bbadacbef
commit fd6bc13e37
3 changed files with 13 additions and 3 deletions
--- a/oslo_db/tests/sqlalchemy/test_sqlalchemy.py
+++ b/oslo_db/tests/sqlalchemy/test_sqlalchemy.py
@@ -348,6 +348,8 @@ class EngineFacadeTestCase(oslo_test.BaseTestCase):
            sqlite_synchronous=mock.ANY,
            pool_timeout=mock.ANY,
            thread_checkin=mock.ANY,
+            json_serializer=None,
+            json_deserializer=None,
        )
        get_maker.assert_called_once_with(engine=create_engine(),
                                          autocommit=False,