Merge remote-tracking branch 'origin/master' into edge

Author: jonasbardino

mig/install/apache-MiG-template.conf

@@ -1779,8 +1779,9 @@ __IS_VERIFYCERTS_COMMENTED__ <VirtualHost *:${PUBLIC_HTTP_PORT}>
         <IfDefine !SID_FQDN>
             <IfDefine BASE_FQDN>
                 # NOTE: the contents of this static file can be generated with:
-                # cd __MIG_CODE__ && python shared/httpsclient.py | \
-                #   grep -A 80 "xml version" > __MIG_STATE__/wwwpublic/oiddiscover.xml
+                # cd __MIG_BASE__ && python mig/server/genoiddiscovery.py > \
+                #     __MIG_STATE__/wwwpublic/oiddiscover.xml
+                # when openid is enabled in MiGserver.conf
                 Header always set X-XRDS-Location "https://${BASE_FQDN}/public/oiddiscover.xml"
             </IfDefine>
         </IfDefine>
@@ -2380,8 +2381,9 @@ __IS_VERIFYCERTS_COMMENTED__ <VirtualHost *:${PUBLIC_HTTP_PORT}>
         <IfDefine !SID_FQDN>
             <IfDefine BASE_FQDN>
                 # NOTE: the contents of this static file can be generated with:
-                # cd __MIG_CODE__ && python shared/httpsclient.py | \
-                #   grep -A 80 "xml version" > __MIG_STATE__/wwwpublic/oiddiscover.xml
+                # cd __MIG_BASE__ && python mig/server/genoiddiscovery.py > \
+                #     __MIG_STATE__/wwwpublic/oiddiscover.xml
+                # when openid is enabled in MiGserver.conf
                 Header always set X-XRDS-Location "https://${BASE_FQDN}/public/oiddiscover.xml"
             </IfDefine>
         </IfDefine>

mig/install/mig-user/.emacs

@@ -120,10 +120,12 @@
 ;   pip install autopep8
 ;   wget https://raw.githubusercontent.com/paetzke/py-autopep8.el/master/py-autopep8.el \
 ;           -O ~/.emacs.d/site-lisp/py-autopep8.el
-;   
+;
+; NOTE: we adjust max line length and disable import mangling as it breaks
+;       some migrid modules.
 (require 'py-autopep8)
 (add-hook 'python-mode-hook 'py-autopep8-enable-on-save)
-(setq py-autopep8-options '("--max-line-length=79"))
+(setq py-autopep8-options '("--max-line-length=80 --ignore E402"))
 
 ;; Prefer espresso mode from  
 ;; http://download.savannah.gnu.org/releases-noredirect/espresso/espresso.el

tests/test_mig_shared_install.py

@@ -34,23 +34,29 @@
 import sys
 
 sys.path.append(os.path.realpath(os.path.join(os.path.dirname(__file__), ".")))
+
 from support import MigTestCase, testmain, temppath, cleanpath, fixturepath
 
-from mig.shared.install import \
-    generate_confs
+from mig.shared.install import generate_confs
 
 class DummyPwInfo:
+    """Wrapper to assist in create_dummy_gpwnam"""
+
     def __init__(self, pw_uid, pw_gid):
         self.pw_uid = pw_uid
         self.pw_gid = pw_gid
 
 
 def create_dummy_gpwnam(pw_uid, pw_gid):
+    """Helper to mimic pwd.getpwnam /etc/passwd lookup for arbitrary users"""
+    
     dummy = DummyPwInfo(pw_uid, pw_gid)
     return lambda _: dummy
 
 
 class MigSharedInstall__generate_confs(MigTestCase):
+    """Unit test helper for the migrid code pointed to in class name"""
+    
     def test_creates_output_directory_and_adds_active_symlink(self):
         symlink_path = temppath('confs', self)
         cleanpath('confs-foobar', self)