diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-09-09 05:24:16 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-09 05:24:16 +0000 |
| commit | bc80b33cf6597fadb1baeb8e41c34f29ab272082 (patch) | |
| tree | b360cc556a9b5d0ae8af615048030ceb9394201c | |
| parent | 4a6b394411963b546ddcd4038cec98623a9a7582 (diff) | |
| parent | 642a58a58b4b1685dd8635fef2ef0063c3cc1947 (diff) | |
| download | platform_test_vts-testcase_kernel-bc80b33cf6597fadb1baeb8e41c34f29ab272082.tar.gz platform_test_vts-testcase_kernel-bc80b33cf6597fadb1baeb8e41c34f29ab272082.tar.bz2 platform_test_vts-testcase_kernel-bc80b33cf6597fadb1baeb8e41c34f29ab272082.zip | |
Merge "fix parse meminfo error" am: 642a58a58b
Original change: https://android-review.googlesource.com/c/platform/test/vts-testcase/kernel/+/1418821
Change-Id: I9761d4fa6ad0c98fc33885f6c8d802aa988b4e17
| -rw-r--r-- | api/proc/ProcMemInfoTest.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/api/proc/ProcMemInfoTest.py b/api/proc/ProcMemInfoTest.py index 1b4652f9..b1068b20 100644 --- a/api/proc/ProcMemInfoTest.py +++ b/api/proc/ProcMemInfoTest.py @@ -28,7 +28,7 @@ def token_name(text): def token_lu(text): return int(text) -@with_pattern(r'(kB)?') +@with_pattern(r'[ ]*(kB)?') def token_kb(text): return text @@ -79,7 +79,7 @@ class ProcMemInfoTest(KernelProcFileTestBase.KernelProcFileTestBase): lines = contents.split('\n') if lines[-1] != '': raise SyntaxError("missing final newline") - return [self.parse_line("{:name}: {:lu}{:^kb}", line, + return [self.parse_line("{:name}: {:lu}{:kb}", line, dict(name=token_name, lu=token_lu, kb=token_kb)) for line in lines[:-1]] def result_correct(self, parse_result): |