Merge cherrypicks of ['googleplex-android-review.googlesource.com/39186893', 'googleplex-android-review.googlesource.com/39214605'] into 26Q2-release. Change-Id: I747811fdca637bd4ffed2e5c8d49dc98974a012d
diff --git a/tests/sdv/e2e_tests/health_monitor/hm_qos_monitoring/sdv_e2e_hm_qos_monitoring_test.py b/tests/sdv/e2e_tests/health_monitor/hm_qos_monitoring/sdv_e2e_hm_qos_monitoring_test.py index 49b1eb0..98bfa0d 100644 --- a/tests/sdv/e2e_tests/health_monitor/hm_qos_monitoring/sdv_e2e_hm_qos_monitoring_test.py +++ b/tests/sdv/e2e_tests/health_monitor/hm_qos_monitoring/sdv_e2e_hm_qos_monitoring_test.py
@@ -47,7 +47,7 @@ "* HB unit_name: com-android-sdv-health-qos-heartbeat-qos-hb-left-fog-light-status\n" "* FQIN of receiver: instance1:com.android.sdv.sample.oem.health.qos_monitoring.QosMonitoredSubscriberBundle/instance1\n" "MONITOR INTERNAL DATA:\n" - "health status: Ok(QosStatus { hb_frequency_violation_detected: true, wire_frequency_violation_detected: false, latency_violation_detected: false })\n" + "health status: Ok(QosStatus { hb_frequency_violation_detected: true, wire_frequency_violation_detected: true, latency_violation_detected: false })\n" "task running: true" )
diff --git a/tests/sdv/e2e_tests/health_monitor/hm_shutdown_test/sdv_hm_shutdown_test.py b/tests/sdv/e2e_tests/health_monitor/hm_shutdown_test/sdv_hm_shutdown_test.py index 7afb478..36cfdaf 100644 --- a/tests/sdv/e2e_tests/health_monitor/hm_shutdown_test/sdv_hm_shutdown_test.py +++ b/tests/sdv/e2e_tests/health_monitor/hm_shutdown_test/sdv_hm_shutdown_test.py
@@ -39,11 +39,12 @@ self.sdv_device = self.get_device("device1").adb() self.device_vpm = SdvVpm(self.sdv_device) - self.sdv_authz_enable_value = self.sdv_device.prop.get(SdvDeviceProperty.AUTHZ_ENABLE) - self.sdv_device.prop.set(SdvDeviceProperty.AUTHZ_ENABLE, "permissions_only") + self.sdv_authz_enable_value = self.sdv_device.prop.get( + SdvDeviceProperty.AUTHZ_ENABLE) + self.sdv_device.prop.set( + SdvDeviceProperty.AUTHZ_ENABLE, "permissions_only") def teardown_class(self): - self.sdv_device.prop.set(SdvDeviceProperty.AUTHZ_ENABLE, self.sdv_authz_enable_value) # Manually destroy controllers. This is necessary because the device # goes offline during the test, which prevents the default Mobly # controller cleanup mechanism from executing correctly. @@ -72,17 +73,18 @@ # The file path remains valid even after the device is offline. log_dir = self.sdv_device.log_path() - # shutdown_vm waits for device to go offline. This ensures Mobly's # logcat capture for this device has stopped. logging.info("Initiating VM shutdown. The device will go offline.") self.device_vpm.shutdown_vm() - asserts.assert_true(os.path.isdir(log_dir), f"Log directory does not exist on the host machine: {log_dir}") + asserts.assert_true(os.path.isdir( + log_dir), f"Log directory does not exist on the host machine: {log_dir}") # There should be one .txt file containing the logcat log_files = os.listdir(log_dir) - asserts.assert_equal(len(log_files), 1, f"Expected 1 log file, but found {len(log_files)} in {log_dir}") + asserts.assert_equal(len( + log_files), 1, f"Expected 1 log file, but found {len(log_files)} in {log_dir}") logcat_filename = log_files[0] logcat_path = os.path.join(log_dir, logcat_filename) @@ -92,8 +94,8 @@ full_log = f.read() asserts.assert_not_in(self.FORBIDDEN_LOG_MESSAGE, - full_log, - "Found forbidden 'Critical agent has died' log during shutdown.") + full_log, + "Found forbidden 'Critical agent has died' log during shutdown.") except signals.TestAbortSignal as e: # Re-raising the abort signal is important for Mobly's runner. raise e