Fix some tests using new module_depends_on being true by default

easybuilders · Sep 18, 2024 · 3fadae0 · 3fadae0
1 parent 9e5cba4
commit 3fadae0
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/test/framework/toy_build.py b/test/framework/toy_build.py
@@ -1727,8 +1727,10 @@ def test_module_only(self):
 
         # make sure load statements for dependencies are included in additional module file generated with --module-only
         modtxt = read_file(toy_mod)
-        self.assertTrue(re.search('load.*intel/2018a', modtxt), "load statement for intel/2018a found in module")
-        self.assertTrue(re.search('load.*GCC/6.4.0-2.28', modtxt), "load statement for GCC/6.4.0-2.28 found in module")
+        self.assertTrue(re.search('(depends|load).*intel/2018a', modtxt), 
+                        "load statement for intel/2018a found in module")
+        self.assertTrue(re.search('(depends|load).*GCC/6.4.0-2.28', modtxt), 
+                        "load statement for GCC/6.4.0-2.28 found in module")
 
         os.remove(toy_mod)
 
@@ -3155,6 +3157,10 @@ def test_toy_multi_deps(self):
         test_ec_txt += "\nexts_list = [('barbar', '1.2', {'start_dir': 'src'})]"
 
         test_ec_txt += "\nmulti_deps = {'GCC': ['4.6.3', '7.3.0-2.30']}"
+
+        # test without depends_on functionality
+        test_ec_txt += "\nmodule_depends_on = False"
+
         write_file(test_ec, test_ec_txt)
 
         test_mod_path = os.path.join(self.test_installpath, 'modules', 'all')