summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorduanyangqi <duanyangqi@xiaomi.com>2020-08-31 16:43:34 +0800
committerrd1gbug rd <rd1gbug.rd@transsion.corp-partner.google.com>2020-09-04 02:12:09 +0000
commit278ac87b8815057beaab6a25d8d61dbda152c66e (patch)
tree89b730b0c0387af1133d34f7dc11b592ae43d519
parent1908cf597e7f5a3da3952e0cdb0a48c98e77bbc4 (diff)
downloadplatform_test_vts-testcase_kernel-oreo-mr1-vts-dev.tar.gz
platform_test_vts-testcase_kernel-oreo-mr1-vts-dev.tar.bz2
platform_test_vts-testcase_kernel-oreo-mr1-vts-dev.zip
fix parse meminfo errororeo-mr1-vts-dev
Test:run vts -m VtsKernelProcFileApi -t VtsKernelProcFileApi#testProcMemInfoTest Bug: 167155158 This bug was caused by upgrade of parse library: parse 1.17.0 Released: Aug 29, 2020 1.17.0 Make left- and center-aligned search consume up to next space Signed-off-by: duanyangqi <duanyangqi@xiaomi.com> Change-Id: I7fca1e3a017db9535c9c5299544f3a4db72c71c2 (cherry picked from commit 69edf5391d23b8c9cf58e990957e49a5ae296205) (cherry picked from commit bcdc459ae09f32b2a942111705f13ecacdc6403b)
-rw-r--r--api/proc/ProcMemInfoTest.py4
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):