commit 8cd9b36dc33247e2818850d6fac4fc8e446a4fda
author android-build-team Robot <android-build-team-robot@google.com> Mon Jul 08 23:35:33 2019 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Mon Jul 08 23:35:33 2019 +0000
tree 20be00916c305aee0c58acec81ce1ff996d605b6
parent 735e1d117fa85c054978805f46a71ad90cb90317
parent bae5418d852de07601ea06a1e66ec966978c6324

Snap for 5622519 from bae5418d852de07601ea06a1e66ec966978c6324 to pi-platform-release

Change-Id: I38316ac47b9bbb75cb3154ad4412be4684b87fe9

api/net/AndroidTest.xml

diff --git a/api/net/AndroidTest.xml b/api/net/AndroidTest.xml
index 25728c8..773dd16 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>

api/proc/ProcAsoundTests.py

diff --git a/api/proc/ProcAsoundTests.py b/api/proc/ProcAsoundTests.py
index 8a2c883..16d766e 100644
--- a/api/proc/ProcAsoundTests.py
+++ b/api/proc/ProcAsoundTests.py
@@ -55,6 +55,8 @@
                 | STRING
                 | COMMA
                 | PERIOD
+                | FLOAT
+                | DASH
                 | HEX_LITERAL'''
         p[0] = p[1]
 

api/proc/VtsKernelProcFileApiTest.py

diff --git a/api/proc/VtsKernelProcFileApiTest.py b/api/proc/VtsKernelProcFileApiTest.py
index 3fe7a41..eb58426 100644
--- a/api/proc/VtsKernelProcFileApiTest.py
+++ b/api/proc/VtsKernelProcFileApiTest.py
@@ -207,12 +207,6 @@
         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.