diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2019-07-08 23:35:33 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2019-07-08 23:35:33 +0000 |
| commit | 8cd9b36dc33247e2818850d6fac4fc8e446a4fda (patch) | |
| tree | 20be00916c305aee0c58acec81ce1ff996d605b6 | |
| parent | 735e1d117fa85c054978805f46a71ad90cb90317 (diff) | |
| parent | bae5418d852de07601ea06a1e66ec966978c6324 (diff) | |
| download | platform_test_vts-testcase_kernel-pie-platform-release.tar.gz platform_test_vts-testcase_kernel-pie-platform-release.tar.bz2 platform_test_vts-testcase_kernel-pie-platform-release.zip | |
Snap for 5622519 from bae5418d852de07601ea06a1e66ec966978c6324 to pi-platform-releasepie-platform-release
Change-Id: I38316ac47b9bbb75cb3154ad4412be4684b87fe9
| -rw-r--r-- | api/net/AndroidTest.xml | 2 | ||||
| -rw-r--r-- | api/proc/ProcAsoundTests.py | 2 | ||||
| -rw-r--r-- | api/proc/VtsKernelProcFileApiTest.py | 6 |
3 files changed, 3 insertions, 7 deletions
diff --git a/api/net/AndroidTest.xml b/api/net/AndroidTest.xml index 25728c82..773dd160 100644 --- a/api/net/AndroidTest.xml +++ b/api/net/AndroidTest.xml @@ -24,6 +24,6 @@ <test class="com.android.tradefed.testtype.VtsMultiDeviceTest"> <option name="test-module-name" value="VtsKernelNetTest" /> <option name="test-case-path" value="vts/testcases/kernel/api/net/VtsKernelNetTest" /> - <option name="test-timeout" value="5m" /> + <option name="test-timeout" value="10m" /> </test> </configuration> diff --git a/api/proc/ProcAsoundTests.py b/api/proc/ProcAsoundTests.py index 8a2c8838..16d766eb 100644 --- a/api/proc/ProcAsoundTests.py +++ b/api/proc/ProcAsoundTests.py @@ -55,6 +55,8 @@ class ProcAsoundCardsTest(KernelProcFileTestBase.KernelProcFileTestBase): | STRING | COMMA | PERIOD + | FLOAT + | DASH | HEX_LITERAL''' p[0] = p[1] diff --git a/api/proc/VtsKernelProcFileApiTest.py b/api/proc/VtsKernelProcFileApiTest.py index 3fe7a41a..eb58426f 100644 --- a/api/proc/VtsKernelProcFileApiTest.py +++ b/api/proc/VtsKernelProcFileApiTest.py @@ -207,12 +207,6 @@ class VtsKernelProcFileApiTest(base_test.BaseTestClass): self.dut.waitForBootCompletion() self.dut.rootAdb() - # Crash the system. - self.dut.adb.shell("\"echo c > %s\"" % filepath) - asserts.assertFalse(self.dut.hasBooted(), "Device is still alive.") - self.dut.waitForBootCompletion() - self.dut.rootAdb() - def testProcUidProcstatSet(self): def UidIOStats(uid): """Returns I/O stats for a given uid. |