Merge pull request #230 from desultory/kmod_recursion

fix kmod recursion, add tests

src/ugrd/kmod/kmod.py

@@ -337,8 +337,8 @@ def _process_kmod_dependencies(self, kmod: str, mod_tree=None) -> None:
             continue
         try:
             self.logger.debug("[%s] Processing dependency: %s" % (kmod, dependency))
-            _process_kmod_dependencies(self, dependency, mod_tree)
             mod_tree.add(dependency)
+            _process_kmod_dependencies(self, dependency, mod_tree)
         except BuiltinModuleError as e:
             self.logger.debug(e)
             continue

tests/test_kmod.py

@@ -0,0 +1,16 @@
+from unittest import TestCase, main
+
+from ugrd.initramfs_generator import InitramfsGenerator
+from zenlib.logging import loggify
+
+
+@loggify
+class TestKmod(TestCase):
+    def test_kmod_recursion(self):
+        """ Check that kernel modules with recursive dependencies don't cause infinite recursion """
+        generator = InitramfsGenerator(logger=self.logger, kmod_init=["ipmi_si"],  config="tests/fullauto.toml")
+        generator.build()
+
+
+if __name__ == "__main__":
+    main()