summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorandroid-build-prod (mdb) <android-build-team-robot@google.com>2020-09-14 23:03:42 +0000
committerandroid-build-prod (mdb) <android-build-team-robot@google.com>2020-09-14 23:03:42 +0000
commitae5b4bea62238dbad81835cc86d36e5c4033a17c (patch)
tree89b730b0c0387af1133d34f7dc11b592ae43d519
parentfb6c7de96a845fed505f071c840d2e1c7bfaec30 (diff)
parent278ac87b8815057beaab6a25d8d61dbda152c66e (diff)
downloadkernel-oreo-mr1-vts-release.tar.gz
Snap for 6834085 from 278ac87b8815057beaab6a25d8d61dbda152c66e to oreo-mr1-vts-releaseandroid-vts-8.1_r14oreo-mr1-vts-release
Change-Id: I934993a19343e3983ca74e29f412ae8fa8276c74
-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):