From 503b93245d7510f9a3f0329b68358093aca51988 Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Sat, 13 Apr 2013 17:56:02 +0200 Subject: [PATCH 1/2] minor info print enhancements for --dep-graph --- easybuild/main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/easybuild/main.py b/easybuild/main.py index 5d99398097..a5b96a27f0 100644 --- a/easybuild/main.py +++ b/easybuild/main.py @@ -943,7 +943,7 @@ def mk_node_name(mod): gv.layout(gvv, 'dot') gv.render(gvv, fn.split('.')[-1], fn) - print "Wrote dependency graph to %s" % fn + print "Wrote dependency graph for %d easyconfigs to %s" % (len(specs), fn) def write_to_xml(succes, failed, filename): """ From 7b2f72c5bc14752b5678a2a353d2408162e6927b Mon Sep 17 00:00:00 2001 From: Kenneth Hoste Date: Sat, 13 Apr 2013 17:56:24 +0200 Subject: [PATCH 2/2] fix load test modules unit test --- easybuild/test/modules.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/easybuild/test/modules.py b/easybuild/test/modules.py index b57ca0ec86..b68e5de51b 100644 --- a/easybuild/test/modules.py +++ b/easybuild/test/modules.py @@ -49,13 +49,16 @@ def test_load(self): testmods = modules.Modules([os.path.join(os.path.dirname(__file__), 'modules')]) ms = testmods.available('', None) for m in ms: - testmods.purge() testmods.add_module([m]) testmods.load() tmp = {"name": m[0], "version": m[1]} assert(tmp in testmods.loaded_modules()) + # remove module again and purge to avoid conflicts when loading modules + testmods.remove_module([m]) + testmods.purge() + def test_LD_LIBRARY_PATH(self): """Make sure LD_LIBRARY_PATH is what it should be when loaded multiple modules."""