Merge PR OCA#497 into 16.0

Signed-off-by lmignon

Author: OCA-git-bot

base_rest/tests/common.py

@@ -70,6 +70,9 @@ def _setup_registry(class_or_instance):
         db_name = get_db_name()
 
         # makes the test component registry available for the db name
+        class_or_instance._original_component_databases = _component_databases.get(
+            db_name
+        )
         _component_databases[db_name] = class_or_instance.comp_registry
 
         # makes the test service registry available for the db name
@@ -145,7 +148,7 @@ def _teardown_registry(class_or_instance):
             class_or_instance._controller_children_classes
         )
         db_name = get_db_name()
-        _component_databases[db_name] = class_or_instance._original_components
+        _component_databases[db_name] = class_or_instance._original_component_databases
         _rest_services_databases[
             db_name
         ] = class_or_instance._original_services_registry