Fundamental test coverage of vgrid module reusing existing structure.

mig/shared/vgrid.py

@@ -1,3 +1,3 @@
 #!/usr/bin/python
 # -*- coding: utf-8 -*-
 #
@@ -20,7 +20,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #
 # -- END_HEADER ---
 #
@@ -45,7 +45,7 @@
     keyword_members, keyword_all, keyword_never, keyword_any, \
     keyword_none, csrf_field, default_vgrid_settings_limit, \
     vgrid_nest_sep, _dot_vgrid
 from mig.shared.fileio import make_symlink, move, check_readonly, check_writable, \
     check_write_access, unpickle, acquire_file_lock, release_file_lock, walk, \
     slow_walk, remove_rec, move_rec, delete_symlink
 from mig.shared.findtype import is_user, is_resource
@@ -123,7 +123,7 @@
     return jobs
 
 
 def vgrid_add_remove_table(client_id,
                            vgrid_name,
                            item_string,
                            script_suffix,
@@ -147,7 +147,7 @@
     _logger = configuration.logger
     out = []
 
     if not item_string in ['owner', 'member', 'resource', 'trigger']:
         out.append({'object_type': 'error_text', 'text':
                     'Internal error: Unknown item type %s.' % item_string
                     })
@@ -225,7 +225,7 @@
                          'csrf_limit': csrf_limit})
 
     # success, so direct and inherit are lists of unique user/res/trigger IDs
     extras = [i for i in inherit if not i in direct]
     if extras:
         table = '''
         <br />
@@ -246,8 +246,8 @@
                         val = ' '.join(val)
                     extra_fields_html += '<td>%s</td>' % val
                 table += \
                     """          <tr><td></td><td>%s</td>%s</tr>""" % (elem[id_field],
                                                                        extra_fields_html)
             elif elem:
                 table += \
                     "          <tr><td></td><td>%s</td></tr>"\
@@ -407,7 +407,7 @@
             if item_string in ["owner", "member"]:
                 dyn_dict['anon_user_id'] = anon_user_id(elem_id)
                 vgrid_table += html_link({
                     'destination': 'viewuser.py?cert_id=%(anon_user_id)s' % dyn_dict,
                     'class': 'userlink iconspace',
                     'title': 'View user details for %s' % elem_id,
                     'text': elem_id})
@@ -633,7 +633,7 @@
     return False
 
 
 def vgrid_is_setting(vgrid_name, option_id, configuration, recursive=True,
                      allow_missing=True):
     """Check if option_id is a setting in vgrid_name. We allow missing
     parent pickle to support autonomous multi-frontend systems.
@@ -644,7 +644,7 @@
                                    allow_missing)
 
 
 def vgrid_is_sharelink(vgrid_name, option_id, configuration, recursive=True,
                        allow_missing=True):
     """Check if option_id is a sharelink in vgrid_name. We allow missing
     parent pickle to support autonomous multi-frontend systems.
@@ -703,12 +703,12 @@
                                                 '', 1)
 
             vgrids_list.append(vgrid_name_without_location)
     if include_default and not default_vgrid in vgrids_list:
         vgrids_list.append(default_vgrid)
     return (True, vgrids_list)
 
 
 def init_vgrid_script_add_rem(
     vgrid_name,
     client_id,
     subject,
@@ -787,7 +787,7 @@
     return (True, msg, [])
 
 
 def init_vgrid_script_list(vgrid_name, client_id, configuration):
     """Helper for vgrid scripts"""
 
     msg = ''
@@ -803,7 +803,7 @@
                                     configuration):
         msg += 'Failure: You must be an owner or member of '\
             + vgrid_name\
             + ' vgrid to get a list of members/owners/resources/triggers/settings/sharelinks'
         return (False, msg, None)
 
     return (True, msg, [])
@@ -833,7 +833,7 @@
             if key == 'read_only':
                 key = 'write_shared_files'
                 val = not val
             if not key in specs_map:
                 _logger.warning("unknown settings key %s for %s (%s)"
                                 % (key, vgrid_name, vgrid_dict))
                 continue
@@ -1224,7 +1224,7 @@
     return True
 
 
 def user_allowed_vgrids(configuration, client_id, inherited=False):
     """Return a list of all VGrids that the user with client_id is allowed to
     access. I.e. the VGrids that the user is member or owner of.
     The optional inherited argument is used to add any parent vgrids to match
@@ -1244,7 +1244,7 @@
     return allowed
 
 
 def res_allowed_vgrids(configuration, client_id):
     """Return a list of all VGrids that the resource with
     client_id is allowed to access. I.e. the VGrids
     that the resource is member of.
@@ -1261,7 +1261,7 @@
     return allowed
 
 
 def vgrid_access_match(configuration, job_owner, job, res_id, res):
     """Match job and resource vgrids and include access control.
     The job_owner and res_id are used directly in vgrid access checks
     so it is important that res_id is on the private (not anonymized)
@@ -1534,7 +1534,7 @@
                               id_list, None, rank)
 
 
 def vgrid_add_triggers(configuration, vgrid_name, id_list, update_id=None,
                        rank=None):
     """Append id_list to pickled list of triggers for vgrid_name"""
     return vgrid_add_entities(configuration, vgrid_name, 'triggers',
@@ -2309,9 +2309,9 @@
     return (success, msg)
 
 
-if __name__ == "__main__":
+def legacy_main(_exit=sys.exit, _print=print):
     from mig.shared.conf import get_configuration_object
-    conf = get_configuration_object()
+    conf = get_configuration_object(skip_log=True, disable_auth_log=True)
     client_id = '/C=DK/CN=John Doe/emailAddress=john@doe.org'
     if sys.argv[1:]:
         client_id = sys.argv[1]
@@ -2432,3 +2432,7 @@
     if load_status:
         print(vgrid_set_members(conf, dummy_vgrid, orig_members))
     print(vgrid_members(dummy_vgrid, conf))
+
+
+if __name__ == "__main__":
+    legacy_main()