diff options
| author | android-build-prod (mdb) <android-build-team-robot@google.com> | 2018-06-18 23:01:53 +0000 |
|---|---|---|
| committer | android-build-prod (mdb) <android-build-team-robot@google.com> | 2018-06-18 23:01:53 +0000 |
| commit | c808c205c6b211cc2a429dc7c8cf05689b82dfb1 (patch) | |
| tree | ce6551f84e74b21d60ed7e6dc9dd88a45002a3b4 | |
| parent | 7388e6e13de00025bfbb34c7d2b289332b5ebb32 (diff) | |
| parent | dd7e65c353e4dd5b49ceaa79844f6b3e1896e6c8 (diff) | |
| download | fuzz-oreo-mr1-vts-release.tar.gz | |
Snap for 4846631 from dd7e65c353e4dd5b49ceaa79844f6b3e1896e6c8 to oreo-mr1-vts-releaseandroid-vts-8.1_r9android-vts-8.1_r8android-vts-8.1_r7android-vts-8.1_r6android-vts-8.1_r5android-vts-8.1_r14android-vts-8.1_r13android-vts-8.1_r12android-vts-8.1_r11android-vts-8.1_r10oreo-mr1-vts-release
Change-Id: I6e19aa0887be9eba5fa9c538c9edffc52c4c0d60
| -rw-r--r-- | template/func_fuzzer_test/func_fuzzer_test.py | 4 | ||||
| -rw-r--r-- | template/iface_fuzzer_test/iface_fuzzer_test.py | 2 | ||||
| -rw-r--r-- | template/libfuzzer_test/libfuzzer_test.py | 4 |
3 files changed, 8 insertions, 2 deletions
diff --git a/template/func_fuzzer_test/func_fuzzer_test.py b/template/func_fuzzer_test/func_fuzzer_test.py index dcbbb3c..537a462 100644 --- a/template/func_fuzzer_test/func_fuzzer_test.py +++ b/template/func_fuzzer_test/func_fuzzer_test.py @@ -38,6 +38,8 @@ class FuncFuzzerTest(libfuzzer_test.LibFuzzerTest): _vts_spec_parser: VtsSpecParser, used to parse .vts files. """ + start_vts_agents = False + def setUpClass(self): """Creates a remote shell instance, and copies data files.""" required_params = [ @@ -50,7 +52,7 @@ class FuncFuzzerTest(libfuzzer_test.LibFuzzerTest): logging.info('%s: %s', keys.ConfigKeys.IKEY_HAL_HIDL_PACKAGE_NAME, self.hal_hidl_package_name) - self._dut = self.registerController(android_device, False)[0] + self._dut = self.android_devices[0] self._dut.adb.shell('mkdir %s -p' % config.FUZZER_TEST_DIR) self._vts_spec_parser = vts_spec_utils.VtsSpecParser( self.data_file_path) diff --git a/template/iface_fuzzer_test/iface_fuzzer_test.py b/template/iface_fuzzer_test/iface_fuzzer_test.py index 59d7ebb..39eaddc 100644 --- a/template/iface_fuzzer_test/iface_fuzzer_test.py +++ b/template/iface_fuzzer_test/iface_fuzzer_test.py @@ -37,6 +37,8 @@ class IfaceFuzzerTest(func_fuzzer_test.FuncFuzzerTest): """ _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. diff --git a/template/libfuzzer_test/libfuzzer_test.py b/template/libfuzzer_test/libfuzzer_test.py index 20539ea..7141acb 100644 --- a/template/libfuzzer_test/libfuzzer_test.py +++ b/template/libfuzzer_test/libfuzzer_test.py @@ -38,6 +38,8 @@ class LibFuzzerTest(base_test.BaseTestClass): _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 = [ @@ -51,7 +53,7 @@ class LibFuzzerTest(base_test.BaseTestClass): logging.info('%s: %s', keys.ConfigKeys.IKEY_BINARY_TEST_SOURCE, self.binary_test_source) - self._dut = self.registerController(android_device, False)[0] + self._dut = self.android_devices[0] self._dut.stop() self._dut.adb.shell('mkdir %s -p' % config.FUZZER_TEST_DIR) |