diff --git a/cmmnbuild_dep_manager/cmmnbuild_dep_manager.py b/cmmnbuild_dep_manager/cmmnbuild_dep_manager.py index d21bb756c5fcb33e49cfc5d0ee2691c1b3a66b25..91fb1cc0308ec3dd6394cc5f46417f91379cf3a5 100644 --- a/cmmnbuild_dep_manager/cmmnbuild_dep_manager.py +++ b/cmmnbuild_dep_manager/cmmnbuild_dep_manager.py @@ -344,7 +344,6 @@ class Manager(object): ) except Exception as e: self.log.error(e) - raise if ret: self._save_modules(modules) return tuple(ret) diff --git a/cmmnbuild_dep_manager/tests/test_cmmnbuild_dep_manager.py b/cmmnbuild_dep_manager/tests/test_cmmnbuild_dep_manager.py index bb5431fc35d51bec43dc8eb9b4134c9ec4d3ad90..2a774471258a96c928ce86d3caebc17326da54f8 100644 --- a/cmmnbuild_dep_manager/tests/test_cmmnbuild_dep_manager.py +++ b/cmmnbuild_dep_manager/tests/test_cmmnbuild_dep_manager.py @@ -69,22 +69,25 @@ def test_no_such_module(caplog, simple_resolver): ] -def test_module_missing_special_resolver_attr(simple_resolver): +def test_module_missing_special_resolver_attr(caplog, simple_resolver): with tmp_mod('a_cmmnbuild_test_module'): - with pytest.raises(AttributeError) as err: - cbdm.Manager('a_cmmnbuild_test_module') - assert str(err.value) == ( - "module a_cmmnbuild_test_module does not declare " - "__test_resolver_deps__, which is needed for SimpleResolver " - "(The test resolver which does nothing) ") + cbdm.Manager('a_cmmnbuild_test_module') + warning = ( + "cmmnbuild_dep_manager", logging.ERROR, + 'module a_cmmnbuild_test_module does not declare ' + '__test_resolver_deps__, which is needed for SimpleResolver ' + '(The test resolver which does nothing) ') + assert warning in caplog.record_tuples -def test_module_dependencies_no_version(simple_resolver): + +def test_module_dependencies_no_version(caplog, simple_resolver): with tmp_mod('a_cmmnbuild_test_module', dependencies=['j1', 'j2']): - with pytest.raises(AttributeError) as err: - cbdm.Manager('a_cmmnbuild_test_module') - assert str(err.value) == ( + cbdm.Manager('a_cmmnbuild_test_module') + warning = ( + "cmmnbuild_dep_manager", logging.ERROR, "module 'a_cmmnbuild_test_module' has no attribute '__version__'") + assert warning in caplog.record_tuples @contextmanager