From c370f477e2fa77d1c9efbb772fbe000a19106543 Mon Sep 17 00:00:00 2001
From: Ed Morley <emorley@mozilla.com>
Date: Tue, 7 Oct 2014 13:59:29 +0100
Subject: [PATCH] Bug 1078670 - Add support for Win32 Mulet builds

The regex for the windows jobs was pre-emptively added by bug 1016448,
but the job names changed slightly since then. Also adds missing tests
for Mulet platforms.
---
 tests/etl/test_buildbot.py | 44 ++++++++++++++++++++++++++++++++++++++
 treeherder/etl/buildbot.py |  2 +-
 2 files changed, 45 insertions(+), 1 deletion(-)

diff --git a/tests/etl/test_buildbot.py b/tests/etl/test_buildbot.py
index cc4491ba6..7dfaf1929 100644
--- a/tests/etl/test_buildbot.py
+++ b/tests/etl/test_buildbot.py
@@ -505,6 +505,50 @@ buildernames = [
                    'os': 'linux',
                    'os_platform': 'b2g-linux64',
                    'vm': True}}),
+    ('Linux x86-64 Mulet cedar build',
+     {'build_type': 'opt',
+      'job_type': 'build',
+      'name': {'group_name': 'unknown',
+               'group_symbol': '?',
+               'name': 'Build',
+               'job_symbol': 'B'},
+      'platform': {'arch': 'x86_64',
+                   'os': 'linux',
+                   'os_platform': 'mulet-linux64',
+                   'vm': False}}),
+    ('Ubuntu VM 12.04 x64 Mulet cedar opt test mochitest-5',
+     {'build_type': 'opt',
+      'job_type': 'unittest',
+      'name': {'group_name': 'Mochitest',
+               'group_symbol': 'M',
+               'name': 'Mochitest',
+               'job_symbol': '5'},
+      'platform': {'arch': 'x86_64',
+                   'os': 'linux',
+                   'os_platform': 'mulet-linux64',
+                   'vm': True}}),
+    ('OS X Mulet cedar non-unified',
+     {'build_type': 'opt',
+      'job_type': 'build',
+      'name': {'group_name': 'unknown',
+               'group_symbol': '?',
+               'name': 'Non-Unified Build',
+               'job_symbol': 'Bn'},
+      'platform': {'arch': 'x86_64',
+                   'os': 'mac',
+                   'os_platform': 'mulet-osx',
+                   'vm': False}}),
+    ('Win32 Mulet cedar build',
+     {'build_type': 'opt',
+      'job_type': 'build',
+      'name': {'group_name': 'unknown',
+               'group_symbol': '?',
+               'name': 'Build',
+               'job_symbol': 'B'},
+      'platform': {'arch': 'x86',
+                   'os': 'win',
+                   'os_platform': 'mulet-win32',
+                   'vm': False}}),
     ('Linux mozilla-inbound build',
     {'build_type': 'opt',
       'job_type': 'build',
diff --git a/treeherder/etl/buildbot.py b/treeherder/etl/buildbot.py
index 97bb656d5..82652dddd 100644
--- a/treeherder/etl/buildbot.py
+++ b/treeherder/etl/buildbot.py
@@ -133,7 +133,7 @@ PLATFORMS_BUILDERNAME = [
         }
     },
     {
-        'regex': re.compile('^Windows.*Mulet', re.IGNORECASE),
+        'regex': re.compile('^Win32.*Mulet', re.IGNORECASE),
         'attributes': {
             'os': 'win',
             'os_platform': 'mulet-win32',