From c24ecdc6f5025ea7e60d0691673de030bd5bf411 Mon Sep 17 00:00:00 2001
From: Noemi Erli <nerli@mozilla.com>
Date: Tue, 2 Mar 2021 02:18:41 +0200
Subject: [PATCH] Backed out changeset f7fa859944a3 (bug 1694172) for causing
 talos crashes CLOSED TREE

---
 taskcluster/ci/test/talos.yml |  2 +-
 testing/talos/talos/test.py   | 19 -------------------
 2 files changed, 1 insertion(+), 20 deletions(-)

diff --git a/taskcluster/ci/test/talos.yml b/taskcluster/ci/test/talos.yml
index dffc0b9d1181..a36e41435875 100644
--- a/taskcluster/ci/test/talos.yml
+++ b/taskcluster/ci/test/talos.yml
@@ -572,7 +572,7 @@ talos-webgl:
             windows10-64-ref-hw-2017/opt: ['mozilla-central']
             (linux|windows10|macos)(?!.*shippable).*: []
             default: ['mozilla-beta', 'trunk']
-    max-run-time: 2100
+    max-run-time: 1800
     mozharness:
         extra-options:
             - --suite=webgl
diff --git a/testing/talos/talos/test.py b/testing/talos/talos/test.py
index 23ea91427e32..40879c5fbac7 100644
--- a/testing/talos/talos/test.py
+++ b/testing/talos/talos/test.py
@@ -205,7 +205,6 @@ class startup_about_home_paint(ts_paint):
 
     url = None
     cycles = 20
-    timeout = 600
     extensions = ["${talos}/startup_test/startup_about_home_paint/addon"]
     tpmanifest = "${talos}/startup_test/startup_about_home_paint/startup_about_home_paint.manifest"
     preferences = {
@@ -278,7 +277,6 @@ class sessionrestore_no_auto_restore(sessionrestore):
     3. Measure the delta between firstPaint and sessionRestored.
     """
 
-    timeout = 300
     preferences = {
         "browser.startup.page": 1,
         "talos.sessionrestore.norestore": True,
@@ -414,7 +412,6 @@ class pdfpaint(PageloaderTest):
 
     tpmanifest = "${talos}/tests/pdfpaint/pdfpaint.manifest"
     tppagecycles = 20
-    timeout = 600
     gecko_profile_entries = 1000000
     pdfpaint = True
     unit = "ms"
@@ -432,7 +429,6 @@ class cpstartup(PageloaderTest):
     extensions = ["${talos}/pageloader", "${talos}/tests/cpstartup/extension"]
     tpmanifest = "${talos}/tests/cpstartup/cpstartup.manifest"
     tppagecycles = 20
-    timeout = 600
     gecko_profile_entries = 1000000
     tploadnocache = True
     unit = "ms"
@@ -457,7 +453,6 @@ class tabpaint(PageloaderTest):
     extensions = ["${talos}/tests/tabpaint", "${talos}/pageloader"]
     tpmanifest = "${talos}/tests/tabpaint/tabpaint.manifest"
     tppagecycles = 20
-    timeout = 600
     gecko_profile_entries = 1000000
     tploadnocache = True
     unit = "ms"
@@ -482,7 +477,6 @@ class tabswitch(PageloaderTest):
     extensions = ["${talos}/tests/tabswitch", "${talos}/pageloader"]
     tpmanifest = "${talos}/tests/tabswitch/tabswitch.manifest"
     tppagecycles = 5
-    timeout = 600
     gecko_profile_entries = 5000000
     tploadnocache = True
     preferences = {
@@ -526,7 +520,6 @@ class tart(PageloaderTest):
     tppagecycles = 25
     tploadnocache = True
     tpmozafterpaint = False
-    timeout = 600
     gecko_profile_interval = 10
     gecko_profile_entries = 1000000
     win_counters = w7_counters = linux_counters = mac_counters = None
@@ -593,7 +586,6 @@ class glterrain(PageloaderTest):
     tploadnocache = True
     tpmozafterpaint = False
     tpchrome = False
-    timeout = 600
     gecko_profile_interval = 10
     gecko_profile_entries = 2000000
     win_counters = w7_counters = linux_counters = mac_counters = None
@@ -621,7 +613,6 @@ class glvideo(PageloaderTest):
     tploadnocache = True
     tpmozafterpaint = False
     tpchrome = False
-    timeout = 600
     gecko_profile_interval = 2
     gecko_profile_entries = 2000000
     win_counters = w7_counters = linux_counters = mac_counters = None
@@ -732,7 +723,6 @@ class tp5o_scroll(PageloaderTest):
     gecko_profile_interval = 2
     gecko_profile_entries = 2000000
     tpscrolltest = True
-    timeout = 2400
     """ASAP mode"""
     tpmozafterpaint = False
     preferences = {
@@ -910,7 +900,6 @@ class tsvgx(PageloaderTest):
     tppagecycles = 25
     tpmozafterpaint = False
     tpchrome = False
-    timeout = 600
     gecko_profile_interval = 10
     gecko_profile_entries = 1000000
     """ASAP mode"""
@@ -935,7 +924,6 @@ class tsvg_static(PageloaderTest):
     tppagecycles = 25
     tpmozafterpaint = True
     tpchrome = False
-    timeout = 600
     gecko_profile_interval = 1
     gecko_profile_entries = 10000000
     filters = filter.ignore_first.prepare(5) + filter.median.prepare()
@@ -953,7 +941,6 @@ class tsvgr_opacity(PageloaderTest):
     tppagecycles = 25
     tpmozafterpaint = True
     tpchrome = False
-    timeout = 600
     gecko_profile_interval = 1
     gecko_profile_entries = 10000000
     filters = filter.ignore_first.prepare(5) + filter.median.prepare()
@@ -971,7 +958,6 @@ class tscrollx(PageloaderTest):
     tppagecycles = 25
     tpmozafterpaint = False
     tpchrome = False
-    timeout = 600
     gecko_profile_interval = 1
     gecko_profile_entries = 1000000
     """ ASAP mode """
@@ -999,7 +985,6 @@ class a11yr(PageloaderTest):
     tppagecycles = 25
     tpmozafterpaint = True
     tpchrome = False
-    timeout = 600
     preferences = {"dom.send_after_paint_to_content": False}
     unit = "ms"
     alert_threshold = 5.0
@@ -1033,7 +1018,6 @@ class motionmark_webgl(WebkitBenchmark):
     # MotionMark benchmark used by many browser vendors (from webkit)
     tpmanifest = "${talos}/tests/motionmark/webgl.manifest"
     unit = "fps"
-    timeout = 600
 
 
 @register_test()
@@ -1114,7 +1098,6 @@ class displaylist_mutate(PageloaderTest):
     tploadnocache = True
     tpmozafterpaint = False
     tpchrome = False
-    timeout = 600
     gecko_profile_interval = 2
     gecko_profile_entries = 2000000
     win_counters = w7_counters = linux_counters = mac_counters = None
@@ -1141,7 +1124,6 @@ class rasterflood_svg(PageloaderTest):
     tploadnocache = True
     tpmozafterpaint = False
     tpchrome = False
-    timeout = 600
     gecko_profile_interval = 2
     gecko_profile_entries = 2000000
     win_counters = w7_counters = linux_counters = mac_counters = None
@@ -1167,7 +1149,6 @@ class rasterflood_gradient(PageloaderTest):
     tploadnocache = True
     tpmozafterpaint = False
     tpchrome = False
-    timeout = 600
     gecko_profile_interval = 2
     gecko_profile_entries = 2000000
     win_counters = w7_counters = linux_counters = mac_counters = None