aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMengqi Guo <mqg@chromium.org>2022-05-25 16:08:35 -0700
committerChromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com>2022-05-27 08:53:29 +0000
commit1d732b5dc137efdc593418cc76a1a8c094395739 (patch)
tree630ce11a47410fb96d97509184847cb26df3e144
parent1b868b681f52ad2d6bb75ae37532a6c7280d6e50 (diff)
downloadautotest-1d732b5dc137efdc593418cc76a1a8c094395739.tar.gz
power test: add a few more keyvals to pdash and plog.html
BUG=b:233650601 TEST=power_LoadTest.fast_gaia power_Dummy Change-Id: I0ded10f2b0163880097d57051b7e5856cffb00fe Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/autotest/+/3668781 Reviewed-by: Puthikorn Voravootivat <puthik@chromium.org> Reviewed-by: Ruben Rodriguez Buchillon <coconutruben@chromium.org> Auto-Submit: Mengqi Guo <mqg@chromium.org> Tested-by: Mengqi Guo <mqg@chromium.org> Commit-Queue: Mengqi Guo <mqg@chromium.org>
-rw-r--r--client/cros/power/power_test.py16
-rwxr-xr-xclient/site_tests/power_LoadTest/power_LoadTest.py5
2 files changed, 12 insertions, 9 deletions
diff --git a/client/cros/power/power_test.py b/client/cros/power/power_test.py
index ef02452798..7976044d9e 100644
--- a/client/cros/power/power_test.py
+++ b/client/cros/power/power_test.py
@@ -225,15 +225,13 @@ class power_Test(test.test):
keyvals['level_backlight_current'] = self.backlight.get_level()
# record battery stats if battery exists
- if not self._force_discharge_success and self.status.on_ac():
- keyvals['b_on_ac'] = 1
- else:
- keyvals['b_on_ac'] = 0
-
- if self._force_discharge_success:
- keyvals['force_discharge'] = 1
- else:
- keyvals['force_discharge'] = 0
+ keyvals['b_on_ac'] = int(not self._force_discharge_success
+ and self.status.on_ac())
+ keyvals['force_discharge'] = int(self._force_discharge_success)
+ for key in [
+ 'b_on_ac', 'force_discharge', 'percent_usb_suspended_time'
+ ]:
+ self._keyvallogger.add_item(key, keyvals[key], 'point', 'perf')
if self.status.battery:
keyvals['ah_charge_full'] = self.status.battery.charge_full
diff --git a/client/site_tests/power_LoadTest/power_LoadTest.py b/client/site_tests/power_LoadTest/power_LoadTest.py
index 4fe0887f0c..671625a313 100755
--- a/client/site_tests/power_LoadTest/power_LoadTest.py
+++ b/client/site_tests/power_LoadTest/power_LoadTest.py
@@ -585,6 +585,11 @@ class power_LoadTest(arc.ArcTest):
higher_is_better=False)
logger = power_dashboard.KeyvalLogger(self._start_time, self._end_time)
+ for key in [
+ 'b_on_ac', 'force_discharge', 'gaia_login',
+ 'percent_usb_suspended_time'
+ ]:
+ logger.add_item(key, keyvals[key], 'point', 'perf')
# Add audio/docs/email/web fail load details to power dashboard and to keyval
for task in ('audio', 'docs', 'email', 'web'):