Fix require_context() decorators.

require_context() and require_admin_context() decorators
don't copy attributes of a decorated function (func_name,
__doc__, __module__) to a wrapper function. This makes
introspection and debugging harder and should be fixed.

Fixes bug 1181606.

Change-Id: I0926df92a40d3fc09b94a0c4b1ded63039abf18b

1 files changed, 16 insertions, 0 deletions

diff --git a/nova/tests/test_db_api.py b/nova/tests/test_db_api.py
index 4afefdfc8..efe63c738 100644
--- a/nova/tests/test_db_api.py
+++ b/nova/tests/test_db_api.py
@@ -1176,6 +1176,22 @@ class DbApiTestCase(DbTestCase):
         _compare(bw_usages[2], expected_bw_usages[2])
         timeutils.clear_time_override()
 
+    def _test_decorator_wraps_helper(self, decorator):
+        def test_func():
+            """Test docstring."""
+
+        decorated_func = decorator(test_func)
+
+        self.assertEquals(test_func.func_name, decorated_func.func_name)
+        self.assertEquals(test_func.__doc__, decorated_func.__doc__)
+        self.assertEquals(test_func.__module__, decorated_func.__module__)
+
+    def test_require_context_decorator_wraps_functions_properly(self):
+        self._test_decorator_wraps_helper(sqlalchemy_api.require_context)
+
+    def test_require_admin_context_decorator_wraps_functions_properly(self):
+        self._test_decorator_wraps_helper(sqlalchemy_api.require_admin_context)
+
 
 def _get_fake_aggr_values():
     return {'name': 'fake_aggregate'}