cheets_CTS_R: Add more tests to the video subtest job.
For running those added tests in more isolated session
not affected by other unstable tests.
BUG=b:179443642
TEST=cheets_CTS_R.11_r3.arm.CtsMediaTestCases.video
Change-Id: I7245cf120b7dc9f62482a00c9d5a141d7b11be03
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/autotest/+/2677072
Tested-by: Kazuhiro Inaba <kinaba@chromium.org>
Auto-Submit: Kazuhiro Inaba <kinaba@chromium.org>
Reviewed-by: Chih-Yu Huang <akahuang@chromium.org>
(cherry picked from commit 8e1149d7723dd2c494ac138c4fb0e945235e47eb)
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/autotest/+/2680368
Reviewed-by: Kazuhiro Inaba <kinaba@chromium.org>
Commit-Queue: Kazuhiro Inaba <kinaba@chromium.org>
diff --git a/server/cros/tradefed/generate_controlfiles_CTS_R.py b/server/cros/tradefed/generate_controlfiles_CTS_R.py
index 7285cca..2a3657e 100755
--- a/server/cros/tradefed/generate_controlfiles_CTS_R.py
+++ b/server/cros/tradefed/generate_controlfiles_CTS_R.py
@@ -524,6 +524,18 @@
'CtsMediaTestCases android.media.cts.ExtractDecodeEditEncodeMuxTest',
'--include-filter',
'CtsMediaTestCases android.media.cts.MediaCodecPlayerTest',
+ '--include-filter',
+ 'CtsMediaTestCases android.media.cts.MediaCodecPlayerTest',
+ '--include-filter',
+ 'CtsMediaTestCases android.media.cts.MediaDrmClearkeyTest',
+ '--include-filter',
+ 'CtsMediaTestCases android.media.cts.MediaRecorderTest',
+ '--include-filter',
+ 'CtsMediaTestCases android.media.cts.MediaSynctest#testPlayVideo',
+ '--include-filter',
+ 'CtsMediaTestCases android.media.cts.VideoCodecTest',
+ '--include-filter',
+ 'CtsMediaTestCases android.media.cts.VideoEncoderTest',
],
'CtsMediaTestCases.download': [
'--include-filter',
diff --git a/server/site_tests/cheets_CTS_R/control.11_r3.arm.CtsMediaTestCases.video b/server/site_tests/cheets_CTS_R/control.11_r3.arm.CtsMediaTestCases.video
index 0edcafa..ac9dfeb 100644
--- a/server/site_tests/cheets_CTS_R/control.11_r3.arm.CtsMediaTestCases.video
+++ b/server/site_tests/cheets_CTS_R/control.11_r3.arm.CtsMediaTestCases.video
@@ -23,7 +23,7 @@
needs_push_media=True,
tag='11_r3.arm.CtsMediaTestCases.video',
test_name='cheets_CTS_R.11_r3.arm.CtsMediaTestCases.video',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsMediaTestCases android.media.cts.AdaptivePlaybackTest', '--include-filter', 'CtsMediaTestCases android.media.cts.DecodeAccuracyTest', '--include-filter', 'CtsMediaTestCases android.media.cts.DecodeEditEncodeTest', '--include-filter', 'CtsMediaTestCases android.media.cts.DecoderConformanceTest', '--include-filter', 'CtsMediaTestCases android.media.cts.EncodeDecodeTest', '--include-filter', 'CtsMediaTestCases android.media.cts.ExtractDecodeEditEncodeMuxTest', '--include-filter', 'CtsMediaTestCases android.media.cts.MediaCodecPlayerTest', '--logcat-on-failure'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsMediaTestCases android.media.cts.AdaptivePlaybackTest', '--include-filter', 'CtsMediaTestCases android.media.cts.DecodeAccuracyTest', '--include-filter', 'CtsMediaTestCases android.media.cts.DecodeEditEncodeTest', '--include-filter', 'CtsMediaTestCases android.media.cts.DecoderConformanceTest', '--include-filter', 'CtsMediaTestCases android.media.cts.EncodeDecodeTest', '--include-filter', 'CtsMediaTestCases android.media.cts.ExtractDecodeEditEncodeMuxTest', '--include-filter', 'CtsMediaTestCases android.media.cts.MediaCodecPlayerTest', '--include-filter', 'CtsMediaTestCases android.media.cts.MediaCodecPlayerTest', '--include-filter', 'CtsMediaTestCases android.media.cts.MediaDrmClearkeyTest', '--include-filter', 'CtsMediaTestCases android.media.cts.MediaRecorderTest', '--include-filter', 'CtsMediaTestCases android.media.cts.MediaSynctest#testPlayVideo', '--include-filter', 'CtsMediaTestCases android.media.cts.VideoCodecTest', '--include-filter', 'CtsMediaTestCases android.media.cts.VideoEncoderTest', '--logcat-on-failure'],
retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsMediaTestCases',
target_plan=None,
diff --git a/server/site_tests/cheets_CTS_R/control.11_r3.x86.CtsMediaTestCases.video b/server/site_tests/cheets_CTS_R/control.11_r3.x86.CtsMediaTestCases.video
index ab393c3..10fedc1 100644
--- a/server/site_tests/cheets_CTS_R/control.11_r3.x86.CtsMediaTestCases.video
+++ b/server/site_tests/cheets_CTS_R/control.11_r3.x86.CtsMediaTestCases.video
@@ -23,7 +23,7 @@
needs_push_media=True,
tag='11_r3.x86.CtsMediaTestCases.video',
test_name='cheets_CTS_R.11_r3.x86.CtsMediaTestCases.video',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsMediaTestCases android.media.cts.AdaptivePlaybackTest', '--include-filter', 'CtsMediaTestCases android.media.cts.DecodeAccuracyTest', '--include-filter', 'CtsMediaTestCases android.media.cts.DecodeEditEncodeTest', '--include-filter', 'CtsMediaTestCases android.media.cts.DecoderConformanceTest', '--include-filter', 'CtsMediaTestCases android.media.cts.EncodeDecodeTest', '--include-filter', 'CtsMediaTestCases android.media.cts.ExtractDecodeEditEncodeMuxTest', '--include-filter', 'CtsMediaTestCases android.media.cts.MediaCodecPlayerTest', '--logcat-on-failure'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsMediaTestCases android.media.cts.AdaptivePlaybackTest', '--include-filter', 'CtsMediaTestCases android.media.cts.DecodeAccuracyTest', '--include-filter', 'CtsMediaTestCases android.media.cts.DecodeEditEncodeTest', '--include-filter', 'CtsMediaTestCases android.media.cts.DecoderConformanceTest', '--include-filter', 'CtsMediaTestCases android.media.cts.EncodeDecodeTest', '--include-filter', 'CtsMediaTestCases android.media.cts.ExtractDecodeEditEncodeMuxTest', '--include-filter', 'CtsMediaTestCases android.media.cts.MediaCodecPlayerTest', '--include-filter', 'CtsMediaTestCases android.media.cts.MediaCodecPlayerTest', '--include-filter', 'CtsMediaTestCases android.media.cts.MediaDrmClearkeyTest', '--include-filter', 'CtsMediaTestCases android.media.cts.MediaRecorderTest', '--include-filter', 'CtsMediaTestCases android.media.cts.MediaSynctest#testPlayVideo', '--include-filter', 'CtsMediaTestCases android.media.cts.VideoCodecTest', '--include-filter', 'CtsMediaTestCases android.media.cts.VideoEncoderTest', '--logcat-on-failure'],
retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsMediaTestCases',
target_plan=None,
