From b9958e376feac071efc315e0fadf5747ead1e87c Mon Sep 17 00:00:00 2001
From: Christoffer Jansson <jansson@webrtc.org>
Date: Fri, 8 Sep 2023 10:57:47 +0200
Subject: [PATCH] Ensure iOS test only run when device is available

Bug: webrtc:15474
Change-Id: I79383bb23b0c0c1fa2d07476230fb6f2fc66ad4f
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/319561
Reviewed-by: Jeremy Leconte <jleconte@google.com>
Commit-Queue: Christoffer Jansson <jansson@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#40720}
---
 infra/specs/internal.client.webrtc.json | 23 +++++++++++++++++++++++
 infra/specs/mixins.pyl                  |  6 ++++--
 infra/specs/mixins_webrtc.pyl           |  4 +++-
 3 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/infra/specs/internal.client.webrtc.json b/infra/specs/internal.client.webrtc.json
index 8fa2918f1c..67033dff3f 100644
--- a/infra/specs/internal.client.webrtc.json
+++ b/infra/specs/internal.client.webrtc.json
@@ -29,6 +29,7 @@
             }
           ],
           "dimensions": {
+            "device_status": "available",
             "os": "iOS-16.6",
             "pool": "chrome.tests"
           },
@@ -68,6 +69,7 @@
             }
           ],
           "dimensions": {
+            "device_status": "available",
             "os": "iOS-16.6",
             "pool": "chrome.tests"
           },
@@ -108,6 +110,7 @@
             }
           ],
           "dimensions": {
+            "device_status": "available",
             "os": "iOS-16.6",
             "pool": "chrome.tests"
           },
@@ -150,6 +153,7 @@
             }
           ],
           "dimensions": {
+            "device_status": "available",
             "os": "iOS-16.6",
             "pool": "chrome.tests"
           },
@@ -190,6 +194,7 @@
             }
           ],
           "dimensions": {
+            "device_status": "available",
             "os": "iOS-16.6",
             "pool": "chrome.tests"
           },
@@ -229,6 +234,7 @@
             }
           ],
           "dimensions": {
+            "device_status": "available",
             "os": "iOS-16.6",
             "pool": "chrome.tests"
           },
@@ -268,6 +274,7 @@
             }
           ],
           "dimensions": {
+            "device_status": "available",
             "os": "iOS-16.6",
             "pool": "chrome.tests"
           },
@@ -307,6 +314,7 @@
             }
           ],
           "dimensions": {
+            "device_status": "available",
             "os": "iOS-16.6",
             "pool": "chrome.tests"
           },
@@ -346,6 +354,7 @@
             }
           ],
           "dimensions": {
+            "device_status": "available",
             "os": "iOS-16.6",
             "pool": "chrome.tests"
           },
@@ -385,6 +394,7 @@
             }
           ],
           "dimensions": {
+            "device_status": "available",
             "os": "iOS-16.6",
             "pool": "chrome.tests"
           },
@@ -424,6 +434,7 @@
             }
           ],
           "dimensions": {
+            "device_status": "available",
             "os": "iOS-16.6",
             "pool": "chrome.tests"
           },
@@ -474,6 +485,7 @@
             }
           ],
           "dimensions": {
+            "device_status": "available",
             "id": "mac-254-e504",
             "os": "iOS-15.7.8",
             "pool": "WebRTC"
@@ -521,6 +533,7 @@
             }
           ],
           "dimensions": {
+            "device_status": "available",
             "os": "iOS-16.6",
             "pool": "chrome.tests"
           },
@@ -560,6 +573,7 @@
             }
           ],
           "dimensions": {
+            "device_status": "available",
             "os": "iOS-16.6",
             "pool": "chrome.tests"
           },
@@ -600,6 +614,7 @@
             }
           ],
           "dimensions": {
+            "device_status": "available",
             "os": "iOS-16.6",
             "pool": "chrome.tests"
           },
@@ -642,6 +657,7 @@
             }
           ],
           "dimensions": {
+            "device_status": "available",
             "os": "iOS-16.6",
             "pool": "chrome.tests"
           },
@@ -682,6 +698,7 @@
             }
           ],
           "dimensions": {
+            "device_status": "available",
             "os": "iOS-16.6",
             "pool": "chrome.tests"
           },
@@ -721,6 +738,7 @@
             }
           ],
           "dimensions": {
+            "device_status": "available",
             "os": "iOS-16.6",
             "pool": "chrome.tests"
           },
@@ -760,6 +778,7 @@
             }
           ],
           "dimensions": {
+            "device_status": "available",
             "os": "iOS-16.6",
             "pool": "chrome.tests"
           },
@@ -799,6 +818,7 @@
             }
           ],
           "dimensions": {
+            "device_status": "available",
             "os": "iOS-16.6",
             "pool": "chrome.tests"
           },
@@ -838,6 +858,7 @@
             }
           ],
           "dimensions": {
+            "device_status": "available",
             "os": "iOS-16.6",
             "pool": "chrome.tests"
           },
@@ -877,6 +898,7 @@
             }
           ],
           "dimensions": {
+            "device_status": "available",
             "os": "iOS-16.6",
             "pool": "chrome.tests"
           },
@@ -916,6 +938,7 @@
             }
           ],
           "dimensions": {
+            "device_status": "available",
             "os": "iOS-16.6",
             "pool": "chrome.tests"
           },
diff --git a/infra/specs/mixins.pyl b/infra/specs/mixins.pyl
index 0a5cf32739..1fcb3d206e 100644
--- a/infra/specs/mixins.pyl
+++ b/infra/specs/mixins.pyl
@@ -68,7 +68,8 @@
     'swarming': {
       'dimensions': {
         'os': 'iOS-16.6',
-        'pool': 'chrome.tests'
+        'pool': 'chrome.tests',
+        'device_status': 'available'
       }
     }
   },
@@ -78,7 +79,8 @@
       'dimensions': {
         'os': 'iOS-15.7.8',
         'pool': 'WebRTC',
-        'id': 'mac-254-e504'
+        'id': 'mac-254-e504',
+        'device_status': 'available'
       }
     }
   },
diff --git a/infra/specs/mixins_webrtc.pyl b/infra/specs/mixins_webrtc.pyl
index acc0cf0999..ded32c10e3 100644
--- a/infra/specs/mixins_webrtc.pyl
+++ b/infra/specs/mixins_webrtc.pyl
@@ -48,7 +48,8 @@
     'swarming': {
       'dimensions': {
         'os': 'iOS-16.6',
-        'pool': 'chrome.tests'
+        'pool': 'chrome.tests',
+        'device_status': 'available'
       }
     }
   },
@@ -59,6 +60,7 @@
         'os': 'iOS-15.7.8',
         'pool': 'WebRTC',
         'id': 'mac-254-e504',
+        'device_status': 'available'
       },
     },
   },