diff options
author | Qiu Tingting <qiutt@fujitsu.com> | 2023-04-17 10:01:07 +0800 |
---|---|---|
committer | Qiu Tingting <qiutt@fujitsu.com> | 2023-04-21 00:39:23 +0000 |
commit | 8f83b67b8ac0a60ff4e3a5a5888474b3033f9b3a (patch) | |
tree | 1081c6f54ce67a1932290ec75968723e72aa8b86 /tests/libpam | |
parent | 9b9fd4724424c9758cdb5f66b66ae61da177a8a6 (diff) |
agl-test-framework: Optimize common function log_process
Add new commone function log_process_gnu for the following tests:
acl
attr
bash
bc
bluez5
busybox
cpio
libpam
libxml2
zlib
SPEC-4758
Signed-off-by: Qiu Tingting <qiutt@fujitsu.com>
Change-Id: I92de3b781badac9cb6d55acd5cc0c601dc4a7c65
Diffstat (limited to 'tests/libpam')
-rw-r--r-- | tests/libpam/parser.py | 37 | ||||
-rw-r--r-- | tests/libpam/run_tests.py | 5 |
2 files changed, 2 insertions, 40 deletions
diff --git a/tests/libpam/parser.py b/tests/libpam/parser.py deleted file mode 100644 index dae4f12..0000000 --- a/tests/libpam/parser.py +++ /dev/null @@ -1,37 +0,0 @@ -# -# this is a parser function specially designed for the 'libpam.log' -# -import re - -def log_parse(log_file): - - # set up rule for regex - reObj = re.compile('^(PASS|FAIL|SKIP+?): (.+)', re.MULTILINE) - - # init a dictionary, it stores the return result - case_list = dict() - - # open file - test_log = open(log_file, 'r') - - # start to read the new line - line = test_log.readline() - - while line: - - # checking regex status in line - matchs = reObj.search(line) - - # if the line fits the regex rule - if matchs: - # spliting elements into a tuple - groups = matchs.groups() - # then just add a new key naming after case_name, along with its values - case_list[groups[1]] = [groups[1], groups[0], ""] - - # jump out if-else, read next line - line = test_log.readline() - - test_log.close() - - return case_list diff --git a/tests/libpam/run_tests.py b/tests/libpam/run_tests.py index 9b2ffab..6899c50 100644 --- a/tests/libpam/run_tests.py +++ b/tests/libpam/run_tests.py @@ -1,6 +1,5 @@ import pytest - -import tests.libpam.parser as parser +import plugins.agl_test_log as log from plugins.agl_test_ptest_base import PTESTBase @@ -10,7 +9,7 @@ class LIBPAMBase(PTESTBase): def log_process(self): log_file = self.get_logfile() - self.case_info_list = parser.log_parse(log_file) + self.case_info_list = log.log_process_gnu(log_file) instance = LIBPAMBase() instance.run_ptest() |