update include_easyblocks tests

Author: migueldiascosta

test/framework/include.py

@@ -102,19 +102,22 @@ def test_include_easyblocks(self):
         myfoo_pyc_path = easybuild.easyblocks.myfoo.__file__
         myfoo_real_py_path = os.path.realpath(os.path.join(os.path.dirname(myfoo_pyc_path), 'myfoo.py'))
         self.assertTrue(os.path.samefile(up(myfoo_real_py_path, 1), myeasyblocks))
+        del sys.modules['easybuild.easyblocks.myfoo']
 
         import easybuild.easyblocks.generic.mybar
         mybar_pyc_path = easybuild.easyblocks.generic.mybar.__file__
         mybar_real_py_path = os.path.realpath(os.path.join(os.path.dirname(mybar_pyc_path), 'mybar.py'))
         self.assertTrue(os.path.samefile(up(mybar_real_py_path, 2), myeasyblocks))
+        del sys.modules['easybuild.easyblocks.generic.mybar']
 
         # existing (test) easyblocks are unaffected
         import easybuild.easyblocks.foofoo
         foofoo_path = os.path.dirname(os.path.dirname(easybuild.easyblocks.foofoo.__file__))
         self.assertTrue(os.path.samefile(foofoo_path, test_easyblocks))
+        del sys.modules['easybuild.easyblocks.foofoo']
 
     def test_include_easyblocks_priority(self):
-        """Test whether easyblocks included via include_easyblocks() get prioroity over others."""
+        """Test whether easyblocks included via include_easyblocks() get priority over others."""
         test_easyblocks = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'sandbox', 'easybuild', 'easyblocks')
 
         # make sure that test 'foo' easyblock is there
@@ -138,15 +141,23 @@ def test_include_easyblocks_priority(self):
             "   pass",
         ])
         write_file(os.path.join(myeasyblocks, 'foo.py'), foo_easyblock_txt)
+
+        # check that the sandboxed easyblock is imported before include_easyblocks is run
+        foo_pyc_path = easybuild.easyblocks.foo.__file__
+        foo_real_py_path = os.path.realpath(os.path.join(os.path.dirname(foo_pyc_path), 'foo.py'))
+        self.assertTrue(os.path.samefile(os.path.dirname(os.path.dirname(foo_pyc_path)), test_easyblocks))
+        self.assertFalse(os.path.samefile(foo_real_py_path, os.path.join(myeasyblocks, 'foo.py')))
+
         include_easyblocks(self.test_prefix, [os.path.join(myeasyblocks, 'foo.py')])
 
+        # check that the included easyblock is imported after include_easyblocks is run
         foo_pyc_path = easybuild.easyblocks.foo.__file__
         foo_real_py_path = os.path.realpath(os.path.join(os.path.dirname(foo_pyc_path), 'foo.py'))
-        self.assertFalse(os.path.samefile(os.path.dirname(foo_pyc_path), test_easyblocks))
+        self.assertFalse(os.path.samefile(os.path.dirname(os.path.dirname(foo_pyc_path)), test_easyblocks))
         self.assertTrue(os.path.samefile(foo_real_py_path, os.path.join(myeasyblocks, 'foo.py')))
 
-        # 'undo' import of foo easyblock
-        del sys.modules['easybuild.easyblocks.foo']
+        # check that the included easyblock is not loaded
+        self.assertFalse('easybuild.easyblocks.foo' in sys.modules)
 
     def test_include_mns(self):
         """Test include_module_naming_schemes()."""

test/framework/options.py

@@ -2917,19 +2917,36 @@ def test_xxx_include_easyblocks_from_pr(self):
         ])
         write_file(os.path.join(self.test_prefix, 'cmakemake.py'), cmm_txt)
 
-        # including the same easyblock twice should fail
+        # including the same easyblock twice should work and give priority to the one from the PR
         args = [
             '--include-easyblocks=%s/*.py' % self.test_prefix,
             '--include-easyblocks-from-pr=1915',
             '--list-easyblocks=detailed',
             '--unittest-file=%s' % self.logfile,
             '--github-user=%s' % GITHUB_TEST_ACCOUNT,
         ]
-        self.assertErrorRegex(EasyBuildError,
-                              "Multiple inclusion of cmakemake.py, check your --include-easyblocks options",
-                              self.eb_main, args, raise_error=True)
+        self.eb_main(args, logfile=dummylogfn, raise_error=True)
+        logtxt = read_file(self.logfile)
+
+        # easyblock included from pr is found
+        path_pattern = os.path.join(self.test_prefix, '.*', 'included-easyblocks-.*', 'easybuild', 'easyblocks')
+        cmm_pattern = os.path.join(path_pattern, 'generic', 'cmakemake.py')
+        cmm_regex = re.compile(r"\|-- CMakeMake \(easybuild.easyblocks.generic.cmakemake @ %s\)" % cmm_pattern, re.M)
+        self.assertTrue(cmm_regex.search(logtxt), "Pattern '%s' found in: %s" % (cmm_regex.pattern, logtxt))
+
+        # easyblock is found via get_easyblock_class
+        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.foo']
+        del sys.modules['easybuild.easyblocks.generic.cmakemake']
         os.remove(os.path.join(self.test_prefix, 'cmakemake.py'))
+        sys.path = orig_local_sys_path
+        import easybuild.easyblocks
+        reload(easybuild.easyblocks)
+        import easybuild.easyblocks.generic
+        reload(easybuild.easyblocks.generic)
 
         # clear log
         write_file(self.logfile, '')