From 7a12d4d6e934ee7d82f05f37629b0cdc919c3ba6 Mon Sep 17 00:00:00 2001
From: Ciure Andrei <aciure@mozilla.com>
Date: Mon, 19 Nov 2018 21:23:35 +0200
Subject: [PATCH] Backed out 2 changesets (bug 1480141, bug 1507767) for
 linting failre at resolve.py CLOSED TREE

Backed out changeset c65076663439 (bug 1507767)
Backed out changeset 936e7792e755 (bug 1480141)
---
 testing/mozbase/moztest/moztest/resolve.py | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/testing/mozbase/moztest/moztest/resolve.py b/testing/mozbase/moztest/moztest/resolve.py
index 07bb91c9e715..581404edaa94 100644
--- a/testing/mozbase/moztest/moztest/resolve.py
+++ b/testing/mozbase/moztest/moztest/resolve.py
@@ -43,8 +43,6 @@ TEST_SUITES = {
         'aliases': ('c', 'rc'),
         'mach_command': 'crashtest',
         'kwargs': {'test_file': None},
-        'task_regex': ['crashtest($|.*(-1|[^0-9])$)',
-                       'test-verify($|.*(-1|[^0-9])$)'],
     },
     'firefox-ui-functional': {
         'aliases': ('fxfn',),
@@ -71,7 +69,6 @@ TEST_SUITES = {
         'aliases': ('mn',),
         'mach_command': 'marionette-test',
         'kwargs': {'tests': None},
-        'task_regex': ['marionette($|.*(-1|[^0-9])$)',],
     },
     'mochitest-a11y': {
         'aliases': ('a11y', 'ally'),
@@ -216,7 +213,7 @@ _test_flavors = {
     'a11y': 'mochitest-a11y',
     'browser-chrome': 'mochitest-browser',
     'chrome': 'mochitest-chrome',
-    'crashtest': 'crashtest',
+    'crashtest': '',
     'firefox-ui-functional': 'firefox-ui-functional',
     'firefox-ui-update': 'firefox-ui-update',
     'marionette': 'marionette',