commit 579d1fd0278de74bd33aa4558b323d71a7901a89
author Kiyoung Kim <kiyoungkim@google.com> Fri Jan 19 07:08:31 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Jan 19 07:08:31 2024 +0000
tree d1242c6381a90b73d9df1804c0fd14f40acc8354
parent d21b50c273b8f02cb6ea1c7cf2eda33fa5a1b1a5
parent 76a596577ff217912dca8a6c109e530384905e00

Merge "Do not check VNDK from Fastboot test" into main

tests/kernel_proc_file_api_test/vts_kernel_proc_file_api_test.py

diff --git a/tests/kernel_proc_file_api_test/vts_kernel_proc_file_api_test.py b/tests/kernel_proc_file_api_test/vts_kernel_proc_file_api_test.py
index 5cd1686..d7a1d58 100644
--- a/tests/kernel_proc_file_api_test/vts_kernel_proc_file_api_test.py
+++ b/tests/kernel_proc_file_api_test/vts_kernel_proc_file_api_test.py
@@ -159,7 +159,7 @@
         # Reboot the device.
         self.dut.shell.Execute("echo b > %s" % filepath)
         self.assertTrue(self.dut.IsShutdown(10), "Device is still alive.")
-        self.assertTrue(self.dut.WaitForBootCompletion(300))
+        self.assertTrue(self.dut.WaitForBootCompletion(600))
         self.assertTrue(self.dut.Root())
 
     def testProcUidProcstatSet(self):

tools/vts-core-tradefed/Android.bp

diff --git a/tools/vts-core-tradefed/Android.bp b/tools/vts-core-tradefed/Android.bp
index 6ee9e69..99af4e2 100644
--- a/tools/vts-core-tradefed/Android.bp
+++ b/tools/vts-core-tradefed/Android.bp
@@ -35,7 +35,7 @@
     wrapper: "etc/vts-tradefed",
     short_name: "VTS",
     full_name: "Vendor Test Suite",
-    version: "14_r3",
+    version: "14_r4",
     static_libs: [
         "cts-tradefed-harness",
         "vts-core-tradefed-harness",