Merge pull request #2978 from vrk-kpa/remove_create_system_context

Remove create system context to reduce race conditions during tests

Author: Zharktas

ckan/ckanext/ckanext-ytp_main/ckanext/ytp/plugin.py

@@ -47,8 +47,6 @@
     get_organization_filters_count, package_count_for_source_customized, group_tree_section, \
     get_highvalue_category_label, scheming_highvalue_category_list
 
-from .tools import create_system_context
-
 from ckan.logic.validators import tag_length_validator, tag_name_validator
 
 try:
@@ -832,13 +830,13 @@ def action_user_create(original_action, context, data_dict):
     result = original_action(context, data_dict)
 
     if result:
-        context = create_system_context()
+        admin_context = {'ignore_auth': True}
 
-        groups = plugins.toolkit.get_action('group_list')(context, {})
+        groups = plugins.toolkit.get_action('group_list')(admin_context, {})
 
         for group in groups:
             member_data = {'id': group, 'username': result['name'], 'role': 'editor'}
-            plugins.toolkit.get_action('group_member_create')(context, member_data)
+            plugins.toolkit.get_action('group_member_create')(admin_context, member_data)
 
     return result
 
@@ -849,13 +847,13 @@ def action_group_create(original_action, context, data_dict):
     result = original_action(context, data_dict)
 
     if result and data_dict.get('type', 'group') == 'group':
-        context = create_system_context()
+        admin_context = {'ignore_auth': True}
 
-        users = plugins.toolkit.get_action('user_list')(context, {})
+        users = plugins.toolkit.get_action('user_list')(admin_context, {})
 
         for user in users:
             member_data = {'id': result['id'], 'username': user['name'], 'role': 'editor'}
-            plugins.toolkit.get_action('group_member_create')(context, member_data)
+            plugins.toolkit.get_action('group_member_create')(admin_context, member_data)
 
     return result
 

ckan/ckanext/ckanext-ytp_main/ckanext/ytp/tools.py

@@ -1,6 +1,5 @@
 import iso8601
 import six
-from ckan import model, plugins
 from ckan.plugins import toolkit
 from ckanext.ytp.converters import to_list_json, from_json_list
 from ckan.lib import helpers
@@ -9,14 +8,6 @@
 import pytz
 
 
-def create_system_context():
-    """ Helper method to create system context for CKAN actions. """
-    context = {'model': model, 'session': model.Session, 'ignore_auth': True}
-    admin_user = plugins.toolkit.get_action('get_site_user')(context, None)
-    context['user'] = admin_user['name']
-    return context
-
-
 def get_locales():
     """ Return all available locales strings. """
     return [locale.language for locale in helpers.i18n.get_available_locales()]