diff options
| author | android-build-prod (mdb) <android-build-team-robot@google.com> | 2020-09-03 23:04:36 +0000 |
|---|---|---|
| committer | android-build-prod (mdb) <android-build-team-robot@google.com> | 2020-09-03 23:04:36 +0000 |
| commit | ef6c98205660cbcff054f45df8a09020d3f0298b (patch) | |
| tree | 29767de8d7465d7e3a982e36d109f2e8b4d2e84d | |
| parent | ddbfb791330cdde878547cc512ca8f28784648a9 (diff) | |
| parent | ab26a45e7f21a8143ad4817ba9f04d4206468975 (diff) | |
| download | platform_test_vts-testcase_kernel-pie-vts-release.tar.gz platform_test_vts-testcase_kernel-pie-vts-release.tar.bz2 platform_test_vts-testcase_kernel-pie-vts-release.zip | |
Snap for 6811874 from ab26a45e7f21a8143ad4817ba9f04d4206468975 to pie-vts-releasepie-vts-release
Change-Id: Id88e517f0c1af945df1f9d5bbb0879125c7a7323
| -rw-r--r-- | api/proc/ProcMemInfoTest.py | 4 | ||||
| -rw-r--r-- | api/sysfs/KernelApiSysfsTest.py | 7 |
2 files changed, 8 insertions, 3 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): diff --git a/api/sysfs/KernelApiSysfsTest.py b/api/sysfs/KernelApiSysfsTest.py index ca5a1e37..b04db0ef 100644 --- a/api/sysfs/KernelApiSysfsTest.py +++ b/api/sysfs/KernelApiSysfsTest.py @@ -231,7 +231,12 @@ class KernelApiSysfsTest(base_test.BaseTestClass): self.ConvertToInteger(content) def testRtcHctosys(self): - '''Check that at least one rtc exists with hctosys = 1.''' + '''If RTC is present, check that at least one rtc exists with hctosys = 1.''' + rtcs = target_file_utils.FindFiles(self.shell, '/dev', + 'rtc*', '-maxdepth 1') + if not rtcs: + return + rtclist = target_file_utils.FindFiles(self.shell, '/sys/class/rtc', 'rtc*', '-maxdepth 1 -type l') for entry in rtclist: |