From ba90d025a1a6bc29acced26f682d8516c84f8b86 Mon Sep 17 00:00:00 2001
From: Andrey Logvin <landrey@webrtc.org>
Date: Wed, 29 Jun 2022 08:55:41 +0000
Subject: [PATCH] Revert "Temporarily disable video_capture_tests on linux"

This reverts commit 915d419eb94782ce424ae59c07d8b4366e88be74.

Reason for revert: The bots which can run this tests is now working

Original change's description:
> Temporarily disable video_capture_tests on linux
>
> No bots can run linux video_capture_tests for now.
>
> Bug: webrtc:14220
> Change-Id: I5dbdefdd104befff92648a0693bee331d2b50e88
> Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/266660
> Commit-Queue: Daniel.L (Byoungchan) Lee <daniel.l@hpcnt.com>
> Reviewed-by: Jeremy Leconte <jleconte@webrtc.org>
> Reviewed-by: Andrey Logvin <landrey@webrtc.org>
> Reviewed-by: Jeremy Leconte <jleconte@google.com>
> Cr-Commit-Position: refs/heads/main@{#37312}

Bug: webrtc:14220
Change-Id: I0a7a82cf64b0692be62a38f3df6416a33917c3d5
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/267105
Owners-Override: Andrey Logvin <landrey@webrtc.org>
Commit-Queue: Andrey Logvin <landrey@webrtc.org>
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Bot-Commit: rubber-stamper@appspot.gserviceaccount.com <rubber-stamper@appspot.gserviceaccount.com>
Cr-Commit-Position: refs/heads/main@{#37369}
---
 infra/specs/test_suite_exceptions.pyl |  9 +--------
 infra/specs/tryserver.webrtc.json     | 22 ++++++++++++++++++++++
 2 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/infra/specs/test_suite_exceptions.pyl b/infra/specs/test_suite_exceptions.pyl
index 5c33d3bda8..c31ab89d2e 100644
--- a/infra/specs/test_suite_exceptions.pyl
+++ b/infra/specs/test_suite_exceptions.pyl
@@ -6,11 +6,4 @@
 # in the file PATENTS.  All contributing project authors may
 # be found in the AUTHORS file in the root of the source tree.
 
-{
-  'video_capture_tests': {
-    'remove_from': [
-      # TODO(bugs.webrtc.org/14220): Re-enable.
-      'linux_rel',
-    ]
-  },
-}
+{}
\ No newline at end of file
diff --git a/infra/specs/tryserver.webrtc.json b/infra/specs/tryserver.webrtc.json
index 27001645aa..549fb765cd 100644
--- a/infra/specs/tryserver.webrtc.json
+++ b/infra/specs/tryserver.webrtc.json
@@ -7821,6 +7821,28 @@
         },
         "test_id_prefix": "ninja://rtc_tools:tools_unittests/"
       },
+      {
+        "isolate_name": "video_capture_tests",
+        "merge": {
+          "args": [],
+          "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
+        },
+        "name": "video_capture_tests",
+        "resultdb": {
+          "result_format": "json"
+        },
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "dimension_sets": [
+            {
+              "cpu": "x86-64",
+              "os": "Ubuntu",
+              "pool": "WebRTC-baremetal-try"
+            }
+          ]
+        },
+        "test_id_prefix": "ninja://modules/video_capture:video_capture_tests/"
+      },
       {
         "isolate_name": "video_engine_tests",
         "merge": {