Merge pull request #10 from boegel/set_default_module_symlink

enhance test_set_default_module to check default in moduleclass symlink path + minor code cleanup/fixes

Author: migueldiascosta

easybuild/framework/easyblock.py

@@ -2603,9 +2603,12 @@ def _set_module_as_default(self, fake=False):
         if self.dry_run:
             dry_run_msg("Marked %s v%s as default version" % (self.name, version))
         else:
-            mod_folderpath = os.path.dirname(self.module_generator.get_module_filepath(fake=fake))
-            mod_symlink_paths = ActiveMNS().det_module_symlink_paths(self.cfg)
-            self.module_generator.set_as_default(mod_folderpath, version, mod_symlink_paths, fake)
+            mod_dir_path = os.path.dirname(self.module_generator.get_module_filepath(fake=fake))
+            if fake:
+                mod_symlink_paths = []
+            else:
+                mod_symlink_paths = ActiveMNS().det_module_symlink_paths(self.cfg)
+            self.module_generator.set_as_default(mod_dir_path, version, mod_symlink_paths=mod_symlink_paths)
 
     def cleanup_step(self):
         """

easybuild/tools/module_generator.py

@@ -415,11 +415,11 @@ def set_alias(self, key, value):
         """
         raise NotImplementedError
 
-    def set_as_default(self, module_folder_path, module_version, mod_symlink_paths=[], fake=False):
+    def set_as_default(self, module_dir_path, module_version, mod_symlink_paths=None):
         """
         Set generated module as default module
 
-        :param module_folder_path: module folder path, e.g. $HOME/easybuild/modules/all/Bison
+        :param module_dir_path: module directory path, e.g. $HOME/easybuild/modules/all/Bison
         :param module_version: module version, e.g. 3.0.4
         :param mod_symlink_paths: list of paths in which symlinks to module files must be created
         """
@@ -873,34 +873,36 @@ def set_alias(self, key, value):
         # quotes are needed, to ensure smooth working of EBDEVEL* modulefiles
         return 'set-alias\t%s\t\t%s\n' % (key, quote_str(value, tcl=True))
 
-    def set_as_default(self, module_folder_path, module_version, mod_symlink_paths=[], fake=False):
+    def set_as_default(self, module_dir_path, module_version, mod_symlink_paths=None):
         """
         Create a .version file inside the package module folder in order to set the default version for TMod
 
-        :param module_folder_path: module folder path, e.g. $HOME/easybuild/modules/all/Bison
+        :param module_dir_path: module directory path, e.g. $HOME/easybuild/modules/all/Bison
         :param module_version: module version, e.g. 3.0.4
         :param mod_symlink_paths: list of paths in which symlinks to module files must be created
         """
         txt = self.MODULE_SHEBANG + '\n'
         txt += 'set ModulesVersion %s\n' % module_version
 
         # write the file no matter what
-        dot_version_path = os.path.join(module_folder_path, '.version')
+        dot_version_path = os.path.join(module_dir_path, '.version')
         write_file(dot_version_path, txt)
 
         # create symlink to .version file in class module folders
-        if not fake:
-            for mod_symlink_path in mod_symlink_paths:
-                module_name = os.path.basename(module_folder_path)
-                class_module_folder = os.path.join(install_path('mod'), mod_symlink_path, module_name)
-                dot_version_link_path = os.path.join(class_module_folder, '.version')
-                if os.path.islink(dot_version_link_path):
-                    link_target = resolve_path(dot_version_link_path)
-                    remove_file(dot_version_link_path)
-                    self.log.info("Removed default version marking from %s.", link_target)
-                elif os.path.exists(dot_version_link_path):
-                    raise EasyBuildError('Found an unexpected file named .version in dir %s' % class_module_folder)
-                symlink(dot_version_path, dot_version_link_path, use_abspath_source=True)
+        if mod_symlink_paths is None:
+            mod_symlink_paths = []
+
+        module_dir_name = os.path.basename(module_dir_path)
+        for mod_symlink_path in mod_symlink_paths:
+            mod_symlink_dir = os.path.join(install_path('mod'), mod_symlink_path, module_dir_name)
+            dot_version_link_path = os.path.join(mod_symlink_dir, '.version')
+            if os.path.islink(dot_version_link_path):
+                link_target = resolve_path(dot_version_link_path)
+                remove_file(dot_version_link_path)
+                self.log.info("Removed default version marking from %s.", link_target)
+            elif os.path.exists(dot_version_link_path):
+                raise EasyBuildError('Found an unexpected file named .version in dir %s', mod_symlink_dir)
+            symlink(dot_version_path, dot_version_link_path, use_abspath_source=True)
 
     def set_environment(self, key, value, relpath=False):
         """
@@ -1294,35 +1296,38 @@ def set_alias(self, key, value):
         # quotes are needed, to ensure smooth working of EBDEVEL* modulefiles
         return 'set_alias("%s", %s)\n' % (key, quote_str(value))
 
-    def set_as_default(self, module_folder_path, module_version, mod_symlink_paths=[], fake=False):
+    def set_as_default(self, module_dir_path, module_version, mod_symlink_paths=None):
         """
         Create a symlink named 'default' inside the package's module folder in order to set the default module version
 
-        :param module_folder_path: module folder path, e.g. $HOME/easybuild/modules/all/Bison
+        :param module_dir_path: module directory path, e.g. $HOME/easybuild/modules/all/Bison
         :param module_version: module version, e.g. 3.0.4
         :param mod_symlink_paths: list of paths in which symlinks to module files must be created
         """
-        def create_default_symlink(module_folder_path):
-            default_filepath = os.path.join(module_folder_path, 'default')
+        def create_default_symlink(path):
+            """Helper function to create 'default' symlink in specified directory."""
+            default_filepath = os.path.join(path, 'default')
 
             if os.path.islink(default_filepath):
                 link_target = resolve_path(default_filepath)
                 remove_file(default_filepath)
                 self.log.info("Removed default version marking from %s.", link_target)
             elif os.path.exists(default_filepath):
-                raise EasyBuildError('Found an unexpected file named default in dir %s' % module_folder_path)
+                raise EasyBuildError('Found an unexpected file named default in dir %s', module_dir_path)
 
             symlink(module_version + self.MODULE_FILE_EXTENSION, default_filepath, use_abspath_source=False)
             self.log.info("Module default version file written to point to %s", default_filepath)
 
-        create_default_symlink(module_folder_path)
+        create_default_symlink(module_dir_path)
 
         # also create symlinks in class module folders
-        if not fake:
-            for mod_symlink_path in mod_symlink_paths:
-                module_name = os.path.basename(module_folder_path)
-                module_folder_path = os.path.join(install_path('mod'), mod_symlink_path, module_name)
-                create_default_symlink(module_folder_path)
+        if mod_symlink_paths is None:
+            mod_symlink_paths = []
+
+        for mod_symlink_path in mod_symlink_paths:
+            mod_dir_name = os.path.basename(module_dir_path)
+            mod_symlink_dir = os.path.join(install_path('mod'), mod_symlink_path, mod_dir_name)
+            create_default_symlink(mod_symlink_dir)
 
     def set_environment(self, key, value, relpath=False):
         """

test/framework/options.py

@@ -3956,6 +3956,30 @@ def test_set_default_module(self):
         else:
             self.assertTrue(False, "Uknown module syntax: %s" % get_module_syntax())
 
+        # make sure default is also set for moduleclass symlink
+        toy_mod_symlink_dir = os.path.join(self.test_installpath, 'modules', 'tools', 'toy')
+        if get_module_syntax() == 'Lua':
+            self.assertEqual(sorted(os.listdir(toy_mod_symlink_dir)), ['0.0-deps.lua', 'default'])
+            default_symlink = os.path.join(toy_mod_symlink_dir, 'default')
+            mod_symlink = os.path.join(toy_mod_symlink_dir, '0.0-deps.lua')
+            self.assertTrue(os.path.islink(default_symlink))
+            self.assertTrue(os.path.islink(mod_symlink))
+            self.assertEqual(os.readlink(default_symlink), '0.0-deps.lua')
+            modfile_path = os.path.join(toy_mod_dir, '0.0-deps.lua')
+            self.assertTrue(os.path.samefile(os.readlink(mod_symlink), modfile_path))
+        elif get_module_syntax() == 'Tcl':
+            self.assertEqual(sorted(os.listdir(toy_mod_symlink_dir)), ['.version', '0.0-deps'])
+            version_symlink = os.path.join(toy_mod_symlink_dir, '.version')
+            mod_symlink = os.path.join(toy_mod_symlink_dir, '0.0-deps')
+            self.assertTrue(os.path.islink(version_symlink))
+            self.assertTrue(os.path.islink(mod_symlink))
+            versionfile_path = os.path.join(toy_mod_dir, '.version')
+            self.assertEqual(os.readlink(version_symlink), versionfile_path)
+            modfile_path = os.path.join(toy_mod_dir, '0.0-deps')
+            self.assertTrue(os.path.samefile(os.readlink(mod_symlink), modfile_path))
+        else:
+            self.assertTrue(False, "Uknown module syntax: %s" % get_module_syntax())
+
     def test_inject_checksums(self):
         """Test for --inject-checksums"""
         topdir = os.path.dirname(os.path.abspath(__file__))