mir/apparmor
2
0
Fork 0
mirror of https://gitlab.com/apparmor/apparmor synced 2025-09-02 23:35:37 +00:00
Code Issues Releases Wiki Activity

Change read_log to return only hashlog

Browse Source 
self.log is unused, drop it.

Also change all places that call read_log() to match the simplified
return value.
This commit is contained in:
Christian Boltz
2019-05-04 00:09:51 +02:00
parent d4512aa5d7
commit 9a92909a89
3 changed files with 5 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
utils/test/test-libapparmor-test_multi.py
View File

@@ -238,7 +238,7 @@ def logfile_to_profile(logfile):
apparmor.aa.active_profiles.add(profile_dummy_file, profile, '')
log_reader = ReadLog(dict(), logfile, apparmor.aa.active_profiles, '')
(log, hashlog) = log_reader.read_log('')
hashlog = log_reader.read_log('')
apparmor.aa.handle_hashlog(hashlog)
apparmor.aa.ask_exec(hashlog)
@@ -261,9 +261,6 @@ def logfile_to_profile(logfile):
log_is_empty = True
if log != []:
log_is_empty = False
for tmpaamode in hashlog:
for tmpprofile in hashlog[tmpaamode]:
for tmpruletype in hashlog[tmpaamode][tmpprofile]:
@@ -273,10 +270,10 @@ def logfile_to_profile(logfile):
if logfile.split('/')[-1][:-3] in log_to_profile_known_empty_log:
# unfortunately this function might be called outside Unittest.TestCase, therefore we can't use assertEqual / assertNotEqual
if log_is_empty == False:
raise Exception('got non-empty log for logfile in log_to_profile_known_empty_log: %s %s' % (logfile, log))
raise Exception('got non-empty log for logfile in log_to_profile_known_empty_log: %s %s' % (logfile, hashlog))
else:
if log_is_empty == True:
raise Exception('got empty log for logfile not in log_to_profile_known_empty_log: %s %s' % (logfile, log))
raise Exception('got empty log for logfile not in log_to_profile_known_empty_log: %s %s' % (logfile, hashlog))
new_profile = apparmor.aa.serialize_profile(log_dict[aamode][profile], profile, {})