Fix another failing test

Author: ocaisa

test/framework/options.py

@@ -4027,8 +4027,8 @@ def test_github_xxx_include_easyblocks_from_pr(self):
         write_file(self.logfile, '')
 
         args = [
-            '--from-pr=22227',  # PR for Togl easyconfig
-            '--include-easyblocks-from-pr=3563,3634',  # PRs for ConfigureMake and GROMACS easyblock
+            '--from-pr=22589',  # PR for DIAMOND easyconfig
+            '--include-easyblocks-from-pr=3677,3674',  # PRs for CMakeMake and LLVM easyblock
             '--unittest-file=%s' % self.logfile,
             '--github-user=%s' % GITHUB_TEST_ACCOUNT,
             '--extended-dry-run',
@@ -4042,27 +4042,27 @@ def test_github_xxx_include_easyblocks_from_pr(self):
         logtxt = read_file(self.logfile)
 
         self.assertFalse(stderr)
-        self.assertEqual(stdout, "== easyblock configuremake.py included from PR #3563\n" +
-                         "== easyblock gromacs.py included from PR #3634\n")
+        self.assertEqual(stdout, "== easyblock cmakemake.py included from PR #3677\n" +
+                         "== easyblock llvm.py included from PR #3674\n")
 
         # easyconfig from pr is found
-        ec_pattern = os.path.join(self.test_prefix, '.*', 'files_pr22227', 't', 'Togl',
-                                  'Togl-2.0-GCCcore-13.3.0.eb')
+        ec_pattern = os.path.join(self.test_prefix, '.*', 'files_pr22589', 'd', 'DIAMOND',
+                                  'DIAMOND-2.1.11-GCC-13.3.0.eb')
         ec_regex = re.compile(r"Parsing easyconfig file %s" % ec_pattern, re.M)
         self.assertTrue(ec_regex.search(logtxt), "Pattern '%s' found in: %s" % (ec_regex.pattern, logtxt))
 
         # easyblock included from pr is found
         eb_regex = re.compile(
-            r"Derived full easyblock module path for ConfigureMake: easybuild.easyblocks.generic.configuremake", re.M)
+            r"Derived full easyblock module path for CMakeMake: easybuild.easyblocks.generic.cmakemake", re.M)
         self.assertTrue(eb_regex.search(logtxt), "Pattern '%s' found in: %s" % (eb_regex.pattern, logtxt))
 
         # easyblock is found via get_easyblock_class
-        klass = get_easyblock_class('ConfigureMake')
+        klass = get_easyblock_class('CMakeMake')
         self.assertTrue(issubclass(klass, EasyBlock), "%s is an EasyBlock derivative class" % klass)
 
         # 'undo' import of easyblocks
-        del sys.modules['easybuild.easyblocks.gromacs']
-        del sys.modules['easybuild.easyblocks.generic.configuremake']
+        del sys.modules['easybuild.easyblocks.llvm']
+        del sys.modules['easybuild.easyblocks.generic.cmakemake']
         sys.path[:] = orig_local_sys_path
         import easybuild.easyblocks
         reload(easybuild.easyblocks)