Bug 1075527 - Add support for Mochitest content sandbox tests

mozilla · Oct 27, 2014 · 8b995f9 · 8b995f9
1 parent 017338b
commit 8b995f9
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/tests/etl/test_buildbot.py b/tests/etl/test_buildbot.py
@@ -1111,6 +1111,17 @@
                    'os': 'win',
                    'os_platform': 'windows8-32',
                    'vm': False}}),
+    ('WINNT 6.2 holly opt test mochitest-csb-1',
+     {'build_type': 'opt',
+      'job_type': 'unittest',
+      'name': {'group_name': 'Mochitest csb',
+               'group_symbol': 'M-csb',
+               'name': 'Mochitest csb',
+               'job_symbol': '1'},
+      'platform': {'arch': 'x86',
+                   'os': 'win',
+                   'os_platform': 'windows8-32',
+                   'vm': False}}),
     ('Android 4.0 Panda cedar opt test instrumentation-background',
      {'build_type': 'opt',
       'job_type': 'unittest',

diff --git a/treeherder/etl/buildbot.py b/treeherder/etl/buildbot.py
@@ -355,6 +355,7 @@
     {"regex": re.compile('talos xperf$'), "desc": "Talos xperf"},
     # ** Unit tests **
     {"regex": re.compile('mozbase$'), "desc": "Mozbase Unit Tests"},
+    {"regex": re.compile('mochitest-csb'), "desc": "Mochitest csb"},
     {"regex": re.compile('mochitest-e10s-browser-chrome'), "desc": "Mochitest e10s Browser Chrome"},
     {"regex": re.compile('mochitest-e10s-devtools-chrome'), "desc": "Mochitest e10s DevTools Browser Chrome"},
     {"regex": re.compile('mochitest-e10s-other'), "desc": "Mochitest e10s Other"},
@@ -549,6 +550,7 @@
     "Mochitest e10s Browser Chrome": "Mochitest e10s",
     "Mochitest e10s DevTools Browser Chrome": "Mochitest e10s",
     "Mochitest e10s Other": "Mochitest e10s",
+    "Mochitest csb": "Mochitest csb",
     "Mochitest OOP": "Mochitest OOP",
     "Crashtest": "Reftest",
     "Crashtest IPC": "Reftest",
@@ -726,6 +728,7 @@
     "Mochitest e10s Browser Chrome": "bc",
     "Mochitest e10s DevTools Browser Chrome": "dt",
     "Mochitest e10s Other": "oth",
+    "Mochitest csb": "M-csb",
     "Mochitest OOP": "M-oop",
     "Robocop": "rc",
     "Webapprt Content": "w",
@@ -892,7 +895,7 @@ def get_symbol(name, bn):
 
     # For multi-part Mochitest, Mochitest-e10s, Mochitest OOP & W3C Web Platform
     # jobs, display only the job part number and not the letters.
-    if n and s in ["M", "M-e10s", "M-oop", "Gij", "Gij-oop", "W"]:
+    if n and s in ["M", "M-e10s", "M-csb", "M-oop", "Gij", "Gij-oop", "W"]:
         return n
 
     return "{0}{1}".format(s, n)