[automerger skipped] Merge "Force remove locking from GCS when device dies during test." am: aed88e2ab2 am: d1a3af4a8e am: 7209542a1b -s ours am: bbd4aaa349 -s ours
am: f72e0f027c -s ours
Change-Id: I629a72ac19370a52dacffd96337ee77fa252376e
diff --git a/kernel/syzkaller/syzkaller_test.py b/kernel/syzkaller/syzkaller_test.py
index 38cfe33..5d30d73 100644
--- a/kernel/syzkaller/syzkaller_test.py
+++ b/kernel/syzkaller/syzkaller_test.py
@@ -107,7 +107,7 @@
"""
test_command = test_case.GetRunCommand()
stdout, stderr, err_code = cmd_utils.ExecuteOneShellCommand(
- test_command, timeout=1800)
+ test_command, timeout=18000)
if err_code:
logging.error(stderr)
else:
diff --git a/template/iface_fuzzer_test/iface_fuzzer_test.py b/template/iface_fuzzer_test/iface_fuzzer_test.py
index 35fd53b..bfdd973 100644
--- a/template/iface_fuzzer_test/iface_fuzzer_test.py
+++ b/template/iface_fuzzer_test/iface_fuzzer_test.py
@@ -37,6 +37,8 @@
"""
_VTS_SPEC_DIR_TARGET = os.path.join(config.FUZZER_TEST_DIR, 'spec')
+ start_vts_agents = False
+
def _PushVtsResources(self, hal_name, hal_version):
"""Pushes resources needed for test to target device.
@@ -75,11 +77,12 @@
string list, directories on target
"""
hal_name_dir = vts_spec_utils.HalNameDir(hal_name)
- spec_dirs = [os.path.join(self._VTS_SPEC_DIR_TARGET, hal_name_dir,
- hal_version)]
+ spec_dirs = [
+ os.path.join(self._VTS_SPEC_DIR_TARGET, hal_name_dir, hal_version)
+ ]
- imported_hals = self._vts_spec_parser.ImportedHals(hal_name,
- hal_version)
+ imported_hals = self._vts_spec_parser.ImportedHals(
+ hal_name, hal_version)
for name, version in imported_hals:
spec_dirs.append(
os.path.join(self._VTS_SPEC_DIR_TARGET,
@@ -93,8 +96,8 @@
hal_name, hal_version = vts_spec_utils.HalPackageToNameAndVersion(
hal_package)
- imported_hals = self._vts_spec_parser.IndirectImportedHals(hal_name,
- hal_version)
+ imported_hals = self._vts_spec_parser.IndirectImportedHals(
+ hal_name, hal_version)
self._PushVtsResources(hal_name, hal_version)
for name, version in imported_hals:
self._PushVtsResources(name, version)
diff --git a/template/libfuzzer_test/libfuzzer_test.py b/template/libfuzzer_test/libfuzzer_test.py
index ba4ea03..239bc99 100644
--- a/template/libfuzzer_test/libfuzzer_test.py
+++ b/template/libfuzzer_test/libfuzzer_test.py
@@ -38,6 +38,8 @@
_dut: AndroidDevice, the device under test as config.
"""
+ start_vts_agents = False
+
def setUpClass(self):
"""Creates a remote shell instance, and copies data files."""
required_params = [