From 9fe6da812b75f1ba3d9b0ba4d3b534fb40548a8f Mon Sep 17 00:00:00 2001
From: Kershaw Chang <kershaw@mozilla.com>
Date: Tue, 26 May 2020 14:30:16 +0000
Subject: [PATCH] Bug 1602832 - P2: Create 'socketprocess_networking' test
 variant r=ahal

Differential Revision: https://phabricator.services.mozilla.com/D58112
---
 taskcluster/ci/config.yml                 |  1 +
 taskcluster/ci/test/xpcshell.yml          |  2 +-
 taskcluster/taskgraph/transforms/tests.py | 15 ++++++++++++++-
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/taskcluster/ci/config.yml b/taskcluster/ci/config.yml
index 83719bff0c7a..336700501149 100644
--- a/taskcluster/ci/config.yml
+++ b/taskcluster/ci/config.yml
@@ -89,6 +89,7 @@ treeherder:
         'X': 'Xpcshell tests'
         'X-1proc': 'Xpcshell tests, without e10s'
         'X-fis': 'Xpcshell tests with fission enabled'
+        'X-spi-nw': 'Xpcshell tests with networking on socket process'
         'L10n': 'Localised Repacks'
         'L10n-Rpk': 'Localized Repackaged Repacks'
         'BM': 'Beetmover'
diff --git a/taskcluster/ci/test/xpcshell.yml b/taskcluster/ci/test/xpcshell.yml
index 736d65f55403..9daf4ef38f18 100644
--- a/taskcluster/ci/test/xpcshell.yml
+++ b/taskcluster/ci/test/xpcshell.yml
@@ -6,7 +6,7 @@ job-defaults:
     suite: xpcshell
     variants:
         by-test-platform:
-            linux1804-64/debug: ['fission']
+            linux1804-64/debug: ['fission', 'socketprocess_networking']
             default: ['fission']
     target:
         by-test-platform:
diff --git a/taskcluster/taskgraph/transforms/tests.py b/taskcluster/taskgraph/transforms/tests.py
index 6ad61ec744c9..c5f2654b7cb5 100644
--- a/taskcluster/taskgraph/transforms/tests.py
+++ b/taskcluster/taskgraph/transforms/tests.py
@@ -206,6 +206,19 @@ TEST_VARIANTS = {
                 ],
             }
         }
+    },
+    'socketprocess_networking': {
+        'description': "{description} with networking on socket process enabled",
+        'suffix': 'spi-nw',
+        'merge': {
+            'mozharness': {
+                'extra-options': [
+                    '--setpref=network.process.enabled=true',
+                    '--setpref=network.http.network_access_on_socket_process.enabled=true',
+                    '--setpref=network.ssl_tokens_cache_enabled=true',
+                ],
+            }
+        }
     }
 }
 
@@ -1304,7 +1317,7 @@ def ensure_spi_disabled_on_all_but_spi(config, tasks):
                        'junit' not in task['suite'] and
                        'raptor' not in task['suite'])
 
-        if has_setpref and variant != 'socketprocess':
+        if has_setpref and variant != 'socketprocess' and variant != 'socketprocess_networking':
             task['mozharness']['extra-options'].append(
                     '--setpref=media.peerconnection.mtransport_process=false')
             task['mozharness']['extra-options'].append(