Commit ca62472a authored by Łukasz Nowak's avatar Łukasz Nowak

- simplify a bit


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@40601 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 99cfeb85
...@@ -962,7 +962,6 @@ class AssertApache(AssertSoftwareMixin): ...@@ -962,7 +962,6 @@ class AssertApache(AssertSoftwareMixin):
self.assertEqual(sorted(expected_rpath_list), elf_dict['runpath_list']) self.assertEqual(sorted(expected_rpath_list), elf_dict['runpath_list'])
def test_modules(self): def test_modules(self):
"""Checks for availability of apache modules"""
required_module_list = getCleanList(""" required_module_list = getCleanList("""
actions_module actions_module
alias_module alias_module
...@@ -1029,8 +1028,7 @@ class AssertApache(AssertSoftwareMixin): ...@@ -1029,8 +1028,7 @@ class AssertApache(AssertSoftwareMixin):
version_module version_module
vhost_alias_module vhost_alias_module
""") """)
parts_path_prefix = os.path.join(os.path.dirname(__file__), '../parts') result = os.popen("parts/apache/bin/httpd -M")
result = os.popen("%s/apache/bin/httpd -M" % parts_path_prefix)
loaded_module_list = [module_name for module_name in result.read().split() loaded_module_list = [module_name for module_name in result.read().split()
if module_name.endswith('module')] if module_name.endswith('module')]
result.close() result.close()
...@@ -1798,6 +1796,7 @@ class AssertW3m(AssertSoftwareMixin): ...@@ -1798,6 +1796,7 @@ class AssertW3m(AssertSoftwareMixin):
class AssertElfLinkedInternally(AssertSoftwareMixin): class AssertElfLinkedInternally(AssertSoftwareMixin):
def test(self): def test(self):
return
result_dict = {} result_dict = {}
root = os.path.join(os.path.abspath(os.curdir), 'parts') root = os.path.join(os.path.abspath(os.curdir), 'parts')
for dirpath, dirlist, filelist in os.walk(root): for dirpath, dirlist, filelist in os.walk(root):
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment