video_Video{Decode, Encode}Accelerator: Remove args_dict out of control files
When tests are run locally by test_that, tests failed with an error
"Unhandled TypeError: run_once() got an unexpected keyword argument 'servo_host'".
This is caused by passing **args_dict in arguments in control files.
This removes it in order to enable to run the tests locally.
BUG=None
TEST=video_VideoDecodeAccelerator and video_VideoEncodeAccelerator
Change-Id: Id763176a1c089f23cdb63ff287ee944f71ec3944
Reviewed-on: https://chromium-review.googlesource.com/1331195
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_VideoDecodeAccelerator/control.h264 b/client/site_tests/video_VideoDecodeAccelerator/control.h264
index af5de0d..dcc6319 100644
--- a/client/site_tests/video_VideoDecodeAccelerator/control.h264
+++ b/client/site_tests/video_VideoDecodeAccelerator/control.h264
@@ -31,6 +31,5 @@
# the bots green.
videos = ['test-25fps.h264:320:240:250:258:35:150:1']
-args_dict = utils.args_to_dict(args)
job.run_test('video_VideoDecodeAccelerator', videos=videos,
- capability='hw_dec_h264_1080_30', **args_dict)
+ capability='hw_dec_h264_1080_30')
diff --git a/client/site_tests/video_VideoDecodeAccelerator/control.vp8 b/client/site_tests/video_VideoDecodeAccelerator/control.vp8
index 5d1223c..21b7a4a 100644
--- a/client/site_tests/video_VideoDecodeAccelerator/control.vp8
+++ b/client/site_tests/video_VideoDecodeAccelerator/control.vp8
@@ -31,6 +31,5 @@
# the bots green.
videos = ['test-25fps.vp8:320:240:250:250:35:150:11']
-args_dict = utils.args_to_dict(args)
job.run_test('video_VideoDecodeAccelerator', videos=videos,
- capability='hw_dec_vp8_1080_30', **args_dict)
+ capability='hw_dec_vp8_1080_30')
diff --git a/client/site_tests/video_VideoDecodeAccelerator/control.vp9 b/client/site_tests/video_VideoDecodeAccelerator/control.vp9
index 2ea7b98..74e362e 100644
--- a/client/site_tests/video_VideoDecodeAccelerator/control.vp9
+++ b/client/site_tests/video_VideoDecodeAccelerator/control.vp9
@@ -30,6 +30,5 @@
# the bots green.
videos = ['test-25fps.vp9:320:240:250:250:35:150:12']
-args_dict = utils.args_to_dict(args)
job.run_test('video_VideoDecodeAccelerator', videos=videos,
- capability='hw_dec_vp9_1080_30', **args_dict)
+ capability='hw_dec_vp9_1080_30')
diff --git a/client/site_tests/video_VideoDecodeAccelerator/control.vp9_2 b/client/site_tests/video_VideoDecodeAccelerator/control.vp9_2
index b3a0705..9eaeb6b 100644
--- a/client/site_tests/video_VideoDecodeAccelerator/control.vp9_2
+++ b/client/site_tests/video_VideoDecodeAccelerator/control.vp9_2
@@ -30,6 +30,5 @@
# the bots green.
videos = ['test-25fps.vp9_2:320:240:250:250:35:150:14']
-args_dict = utils.args_to_dict(args)
job.run_test('video_VideoDecodeAccelerator', videos=videos,
- capability='hw_dec_vp9-2_1080_30', **args_dict)
+ capability='hw_dec_vp9-2_1080_30')
diff --git a/client/site_tests/video_VideoDecodeAccelerator/video_VideoDecodeAccelerator.py b/client/site_tests/video_VideoDecodeAccelerator/video_VideoDecodeAccelerator.py
index 6128a7c..3689fe1 100644
--- a/client/site_tests/video_VideoDecodeAccelerator/video_VideoDecodeAccelerator.py
+++ b/client/site_tests/video_VideoDecodeAccelerator/video_VideoDecodeAccelerator.py
@@ -21,8 +21,7 @@
@helper_logger.video_log_wrapper
@chrome_binary_test.nuke_chrome
- def run_once(self, videos, capability, use_cr_source_dir=True,
- gtest_filter=None):
+ def run_once(self, videos, capability, use_cr_source_dir=True):
"""
Runs video_decode_accelerator_unittest on the videos.
@@ -52,9 +51,6 @@
cmd_line_list.append(helper_logger.chrome_vmodule_flag())
cmd_line_list.append('--ozone-platform=gbm')
- if gtest_filter:
- cmd_line_list.append('--gtest_filter="%s"' % gtest_filter)
-
cmd_line = ' '.join(cmd_line_list)
try:
self.run_chrome_test_binary(self.binary, cmd_line)
diff --git a/client/site_tests/video_VideoEncodeAccelerator/control.h264 b/client/site_tests/video_VideoEncodeAccelerator/control.h264
index dca5d64..e259d2f 100644
--- a/client/site_tests/video_VideoEncodeAccelerator/control.h264
+++ b/client/site_tests/video_VideoEncodeAccelerator/control.h264
@@ -55,6 +55,5 @@
# ('tulip2/tulip2-240x136-ed58afc99d08e5d21013c1a5056e43bf.yuv',
# 240, 136, 100000, None, None, None, 1)]
-args_dict = utils.args_to_dict(args)
job.run_test('video_VideoEncodeAccelerator', in_cloud=True, streams=streams,
- profile=1, tag='h264', capability='hw_enc_h264_1080_30', **args_dict)
+ profile=1, tag='h264', capability='hw_enc_h264_1080_30')
diff --git a/client/site_tests/video_VideoEncodeAccelerator/control.h264.bvt b/client/site_tests/video_VideoEncodeAccelerator/control.h264.bvt
index 57f108d..4f0b698 100644
--- a/client/site_tests/video_VideoEncodeAccelerator/control.h264.bvt
+++ b/client/site_tests/video_VideoEncodeAccelerator/control.h264.bvt
@@ -36,6 +36,5 @@
('media/test/data/bear_320x192_40frames.nv12.yuv',
320, 192, 200000, None, None, None, 6)]
-args_dict = utils.args_to_dict(args)
job.run_test('video_VideoEncodeAccelerator', in_cloud=False, streams=streams,
- profile=1, tag='h264', capability='hw_enc_h264_1080_30', **args_dict)
+ profile=1, tag='h264', capability='hw_enc_h264_1080_30')
diff --git a/client/site_tests/video_VideoEncodeAccelerator/control.vp8 b/client/site_tests/video_VideoEncodeAccelerator/control.vp8
index b313ea7..43dfabd 100644
--- a/client/site_tests/video_VideoEncodeAccelerator/control.vp8
+++ b/client/site_tests/video_VideoEncodeAccelerator/control.vp8
@@ -55,6 +55,5 @@
# ('tulip2/tulip2-240x136-ed58afc99d08e5d21013c1a5056e43bf.yuv',
# 240, 136, 100000, None, None, None, 1)]
-args_dict = utils.args_to_dict(args)
job.run_test('video_VideoEncodeAccelerator', in_cloud=True, streams=streams,
- profile=11, tag='vp8', capability='hw_enc_vp8_1080_30', **args_dict)
+ profile=11, tag='vp8', capability='hw_enc_vp8_1080_30')
diff --git a/client/site_tests/video_VideoEncodeAccelerator/control.vp8.bvt b/client/site_tests/video_VideoEncodeAccelerator/control.vp8.bvt
index 066d260..6f5799f 100644
--- a/client/site_tests/video_VideoEncodeAccelerator/control.vp8.bvt
+++ b/client/site_tests/video_VideoEncodeAccelerator/control.vp8.bvt
@@ -36,6 +36,5 @@
('media/test/data/bear_320x192_40frames.nv12.yuv',
320, 192, 200000, None, None, None, 6)]
-args_dict = utils.args_to_dict(args)
job.run_test('video_VideoEncodeAccelerator', in_cloud=False, streams=streams,
- profile=11, tag='vp8', capability='hw_enc_vp8_1080_30', **args_dict)
+ profile=11, tag='vp8', capability='hw_enc_vp8_1080_30')
diff --git a/client/site_tests/video_VideoEncodeAccelerator/video_VideoEncodeAccelerator.py b/client/site_tests/video_VideoEncodeAccelerator/video_VideoEncodeAccelerator.py
index 3e4d1fc..95fb6e3 100644
--- a/client/site_tests/video_VideoEncodeAccelerator/video_VideoEncodeAccelerator.py
+++ b/client/site_tests/video_VideoEncodeAccelerator/video_VideoEncodeAccelerator.py
@@ -187,14 +187,12 @@
@helper_logger.video_log_wrapper
@chrome_binary_test.nuke_chrome
- def run_once(self, in_cloud, streams, profile, capability,
- gtest_filter=None):
+ def run_once(self, in_cloud, streams, profile, capability):
"""Runs video_encode_accelerator_unittest on the streams.
@param in_cloud: Input file needs to be downloaded first.
@param streams: The test streams for video_encode_accelerator_unittest.
@param profile: The profile to encode into.
- @param gtest_filter: test case filter.
@raises error.TestFail for video_encode_accelerator_unittest failures.
"""
@@ -239,14 +237,8 @@
# Command line |gtest_filter| can override get_filter_option().
predefined_filter = self.get_filter_option(profile, (width, height))
- if gtest_filter and predefined_filter:
- logging.warning('predefined gtest filter is suppressed: %s',
- predefined_filter)
- applied_filter = gtest_filter
- else:
- applied_filter = predefined_filter
- if applied_filter:
- cmd_line_list.append('--gtest_filter="%s"' % applied_filter)
+ if predefined_filter:
+ cmd_line_list.append('--gtest_filter="%s"' % predefined_filter)
cmd_line = ' '.join(cmd_line_list)
logging.debug('Executing with argument: %s', cmd_line)