From 2c8aa7e49c5ded090ee084a9cedb4ebcb130d666 Mon Sep 17 00:00:00 2001
From: Dave Hunt <dhunt@mozilla.com>
Date: Mon, 29 Mar 2021 21:11:11 +0000
Subject: [PATCH] Bug 1700767 - Remove live site filter for Raptor tests;
 r=perftest-reviewers,Bebe

Differential Revision: https://phabricator.services.mozilla.com/D109665
---
 testing/raptor/raptor/manifest.py | 53 +------------------------------
 tools/lint/rejected-words.yml     |  1 -
 2 files changed, 1 insertion(+), 53 deletions(-)

diff --git a/testing/raptor/raptor/manifest.py b/testing/raptor/raptor/manifest.py
index 3776b930b223..63979c8ed9f7 100644
--- a/testing/raptor/raptor/manifest.py
+++ b/testing/raptor/raptor/manifest.py
@@ -38,26 +38,6 @@ playback_settings = [
     "playback_recordings",
 ]
 
-whitelist_live_site_tests = [
-    "booking-sf",
-    "cnn-ampstories",
-    "discord",
-    "expedia",
-    "fashionbeans",
-    "google-accounts",
-    "imdb-firefox",
-    "medium-article",
-    "nytimes",
-    "people-article",
-    "raptor-youtube-playback",
-    "youtube-playback",
-    "reddit-thread",
-    "rumble-fox",
-    "stackoverflow-question",
-    "urbandictionary-define",
-    "wikia-marvel",
-]
-
 
 def filter_app(tests, values):
     for test in tests:
@@ -65,43 +45,12 @@ def filter_app(tests, values):
             yield test
 
 
-def filter_live_sites(tests, values):
-    # if a test uses live sites only allow it to run if running locally or on try
-    # this prevents inadvertently submitting live site data to perfherder
-    for test in tests:
-        if test.get("use_live_sites", "false") == "true":
-            # can run with live sites when running locally
-            if values["run_local"] is True:
-                yield test
-            # can run with live sites if running on try
-            elif "hg.mozilla.org/try" in os.environ.get("GECKO_HEAD_REPOSITORY", "n/a"):
-                yield test
-
-            # can run with live sites when white-listed
-            # pylint --py3k: W1639
-            elif list(
-                filter(
-                    lambda name: test["name"].startswith(name),
-                    whitelist_live_site_tests,
-                )
-            ):
-                yield test
-
-            else:
-                LOG.warning(
-                    "%s is not allowed to run with use_live_sites" % test["name"]
-                )
-        else:
-            # not using live-sites so go ahead
-            yield test
-
-
 def get_browser_test_list(browser_app, run_local):
     LOG.info(raptor_ini)
     test_manifest = TestManifest([raptor_ini], strict=False)
     info = {"app": browser_app, "run_local": run_local}
     return test_manifest.active_tests(
-        exists=False, disabled=False, filters=[filter_app, filter_live_sites], **info
+        exists=False, disabled=False, filters=[filter_app], **info
     )
 
 
diff --git a/tools/lint/rejected-words.yml b/tools/lint/rejected-words.yml
index e95e54304c92..e663ecc4821b 100644
--- a/tools/lint/rejected-words.yml
+++ b/tools/lint/rejected-words.yml
@@ -329,7 +329,6 @@ avoid-blacklist-and-whitelist:
         - testing/profiles/unittest-required/user.js
         - testing/raptor/browsertime/browsertime_scenario.js
         - testing/raptor/raptor/control_server.py
-        - testing/raptor/raptor/manifest.py
         - testing/specialpowers/content/SpecialPowersChild.jsm
         - testing/talos/talos/tests/devtools/addon/content/pages/custom/debugger/static/js/main.js
         - testing/web-platform/tests/common/security-features/README.md