From 283c3df2acbc006c6d5345180042c2da70d7cd95 Mon Sep 17 00:00:00 2001
From: Jeremy Leconte <jleconte@google.com>
Date: Mon, 3 Jul 2023 14:36:41 +0200
Subject: [PATCH] Fix TCPChannelClientTest.java when running on multiple
 shards.

Change-Id: I57947d5801cc9545939a9d38d546424829583a07
Bug: None
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/311240
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Commit-Queue: Jeremy Leconte <jleconte@google.com>
Cr-Commit-Position: refs/heads/main@{#40391}
---
 infra/specs/client.webrtc.json    | 12 ++++++++++++
 infra/specs/test_suites.pyl       |  8 +++++++-
 infra/specs/tryserver.webrtc.json | 12 ++++++++++++
 3 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/infra/specs/client.webrtc.json b/infra/specs/client.webrtc.json
index 7494e53cf4..3aede75341 100644
--- a/infra/specs/client.webrtc.json
+++ b/infra/specs/client.webrtc.json
@@ -453,6 +453,9 @@
     ],
     "junit_tests": [
       {
+        "args": [
+          "--shards=1"
+        ],
         "name": "android_examples_junit_tests",
         "resultdb": {
           "enable": true,
@@ -924,6 +927,9 @@
     ],
     "junit_tests": [
       {
+        "args": [
+          "--shards=1"
+        ],
         "name": "android_examples_junit_tests",
         "resultdb": {
           "enable": true,
@@ -1424,6 +1430,9 @@
     ],
     "junit_tests": [
       {
+        "args": [
+          "--shards=1"
+        ],
         "name": "android_examples_junit_tests",
         "resultdb": {
           "enable": true,
@@ -1895,6 +1904,9 @@
     ],
     "junit_tests": [
       {
+        "args": [
+          "--shards=1"
+        ],
         "name": "android_examples_junit_tests",
         "resultdb": {
           "enable": true,
diff --git a/infra/specs/test_suites.pyl b/infra/specs/test_suites.pyl
index bf4be30feb..9430d45a39 100644
--- a/infra/specs/test_suites.pyl
+++ b/infra/specs/test_suites.pyl
@@ -9,7 +9,13 @@
 {
   'basic_suites': {
     'android_junit_tests': {
-      'android_examples_junit_tests': {},
+      'android_examples_junit_tests': {
+        'args': [
+          # Force number of shards to be one because of none hermetic tests
+          # in TCPChannelClientTest and DirectRTCClientTest.
+          '--shards=1',
+        ]
+      },
       'android_sdk_junit_tests': {},
     },
     'android_tests': {
diff --git a/infra/specs/tryserver.webrtc.json b/infra/specs/tryserver.webrtc.json
index 7b92f19316..1d110d2781 100644
--- a/infra/specs/tryserver.webrtc.json
+++ b/infra/specs/tryserver.webrtc.json
@@ -478,6 +478,9 @@
     ],
     "junit_tests": [
       {
+        "args": [
+          "--shards=1"
+        ],
         "name": "android_examples_junit_tests",
         "resultdb": {
           "enable": true,
@@ -974,6 +977,9 @@
     ],
     "junit_tests": [
       {
+        "args": [
+          "--shards=1"
+        ],
         "name": "android_examples_junit_tests",
         "resultdb": {
           "enable": true,
@@ -1470,6 +1476,9 @@
     ],
     "junit_tests": [
       {
+        "args": [
+          "--shards=1"
+        ],
         "name": "android_examples_junit_tests",
         "resultdb": {
           "enable": true,
@@ -1992,6 +2001,9 @@
     ],
     "junit_tests": [
       {
+        "args": [
+          "--shards=1"
+        ],
         "name": "android_examples_junit_tests",
         "resultdb": {
           "enable": true,