autotest-capability: Apply to video_HangoutHardwarePerf
BUG=chromium:789866
TEST=test_that video_HangoutHardwarePerf on hana
Change-Id: I328c79034380c1449ec14cc4e789ff29429708c8
Reviewed-on: https://chromium-review.googlesource.com/974684
Commit-Ready: Hirokazu Honda <hiroh@chromium.org>
Tested-by: Hirokazu Honda <hiroh@chromium.org>
Reviewed-by: Chih-Yu Huang <akahuang@chromium.org>
diff --git a/client/site_tests/video_HangoutHardwarePerf/control.cpu.vp8 b/client/site_tests/video_HangoutHardwarePerf/control.cpu.vp8
index abe71cc..98134a2 100644
--- a/client/site_tests/video_HangoutHardwarePerf/control.cpu.vp8
+++ b/client/site_tests/video_HangoutHardwarePerf/control.cpu.vp8
@@ -17,7 +17,7 @@
TEST_CLASS = 'video'
TEST_TYPE = 'client'
# Reboot in the lab after the test ends.
-DEPENDENCIES = 'cleanup-reboot, hw_video_acc_vp8, hw_video_acc_enc_vp8'
+DEPENDENCIES = 'cleanup-reboot'
BUG_TEMPLATE = {
'labels': ['OS-Chrome', 'VideoTestFailure'],
'cc': ['chromeos-video-test-failures@google.com'],
@@ -53,4 +53,5 @@
resources=resources,
decode_videos=decode_videos,
encode_videos=encode_videos,
- measurement='cpu')
+ measurement='cpu',
+ capabilities=['hw_dec_vp8_1080_30', 'hw_enc_vp8_1080_30'])
diff --git a/client/site_tests/video_HangoutHardwarePerf/control.power.vp8 b/client/site_tests/video_HangoutHardwarePerf/control.power.vp8
index bde8468..14afc73 100644
--- a/client/site_tests/video_HangoutHardwarePerf/control.power.vp8
+++ b/client/site_tests/video_HangoutHardwarePerf/control.power.vp8
@@ -16,7 +16,7 @@
TEST_CLASS = 'video'
TEST_TYPE = 'client'
# Reboot in the lab after the test ends.
-DEPENDENCIES = 'cleanup-reboot, hw_video_acc_vp8, hw_video_acc_enc_vp8'
+DEPENDENCIES = 'cleanup-reboot'
BUG_TEMPLATE = {
'labels': ['OS-Chrome', 'VideoTestFailure'],
}
@@ -54,4 +54,5 @@
resources=resources,
decode_videos=decode_videos,
encode_videos=encode_videos,
- measurement='power')
+ measurement='power',
+ capabilities=['hw_dec_vp8_1080_30', 'hw_enc_vp8_1080_30'])
diff --git a/client/site_tests/video_HangoutHardwarePerf/video_HangoutHardwarePerf.py b/client/site_tests/video_HangoutHardwarePerf/video_HangoutHardwarePerf.py
index cccd855..4958908 100644
--- a/client/site_tests/video_HangoutHardwarePerf/video_HangoutHardwarePerf.py
+++ b/client/site_tests/video_HangoutHardwarePerf/video_HangoutHardwarePerf.py
@@ -11,6 +11,7 @@
from autotest_lib.client.cros import service_stopper
from autotest_lib.client.cros.audio import cmd_utils
from autotest_lib.client.cros.power import power_status, power_utils
+from autotest_lib.client.cros.video import device_capability
from autotest_lib.client.cros.video import encoder_utils
from autotest_lib.client.cros.video import helper_logger
@@ -265,7 +266,12 @@
@helper_logger.video_log_wrapper
@chrome_binary_test.nuke_chrome
- def run_once(self, resources, decode_videos, encode_videos, measurement):
+ def run_once(self, resources, decode_videos, encode_videos, measurement,
+ capabilities):
+ dc = device_capability.DeviceCapability()
+ for cap in capabilities:
+ dc.ensure_capability(cap)
+
self._downloads = DownloadManager(tmpdir = self.tmpdir)
try:
self._downloads.download_all(resources)