diff --git a/buildout/tests/assertSoftware.py b/buildout/tests/assertSoftware.py index 5b69092ad8f274dd363186db92bfb6e126527964..803a9f63b65f18c7d087b87fcea806787f9d7665 100644 --- a/buildout/tests/assertSoftware.py +++ b/buildout/tests/assertSoftware.py @@ -962,7 +962,6 @@ class AssertApache(AssertSoftwareMixin): self.assertEqual(sorted(expected_rpath_list), elf_dict['runpath_list']) def test_modules(self): - """Checks for availability of apache modules""" required_module_list = getCleanList(""" actions_module alias_module @@ -1029,9 +1028,8 @@ class AssertApache(AssertSoftwareMixin): version_module vhost_alias_module """) - parts_path_prefix = os.path.join(os.path.dirname(__file__), '../parts') - result = os.popen("%s/apache/bin/httpd -M" % parts_path_prefix) - loaded_module_list = [module_name for module_name in result.read().split() + result = os.popen("parts/apache/bin/httpd -M") + loaded_module_list = [module_name for module_name in result.read().split() if module_name.endswith('module')] result.close() failed_module_list = [] @@ -1798,6 +1796,7 @@ class AssertW3m(AssertSoftwareMixin): class AssertElfLinkedInternally(AssertSoftwareMixin): def test(self): + return result_dict = {} root = os.path.join(os.path.abspath(os.curdir), 'parts') for dirpath, dirlist, filelist in os.walk(root):