Bug 1474469 - Make sure nightly-l10n failures are properly reported. r=tomprince

Differential Revision: https://phabricator.services.mozilla.com/D2040

--HG--
extra : moz-landing-system : lando

testing/mozharness/mozharness/base/script.py

@@ -2211,17 +2211,6 @@ class BaseScript(ScriptMixin, LogMixin, object):
         # Summaries need a lot more love.
         self.log(message, level=level)
 
-    def add_failure(self, key, message="%(key)s failed.", level=ERROR,
-                    increment_return_code=True):
-        if key not in self.failures:
-            self.failures.append(key)
-            self.add_summary(message % {'key': key}, level=level)
-            if increment_return_code:
-                self.return_code += 1
-
-    def query_failure(self, key):
-        return key in self.failures
-
     def summarize_success_count(self, success_count, total_count,
                                 message="%d of %d successful.",
                                 level=None):

testing/mozharness/mozharness/mozilla/automation.py

@@ -64,6 +64,15 @@ class AutomationMixin(object):
             if set_return_code:
                 self.return_code = EXIT_STATUS_DICT[self.worst_status]
 
+    def add_failure(self, key, message="%(key)s failed.", level=ERROR):
+        if key not in self.failures:
+            self.failures.append(key)
+            self.add_summary(message % {'key': key}, level=level)
+            self.record_status(TBPL_FAILURE)
+
+    def query_failure(self, key):
+        return key in self.failures
+
     def set_property(self, prop_name, prop_value):
         self.info("Setting property %s to %s" % (prop_name, prop_value))
         self.properties[prop_name] = prop_value

testing/mozharness/scripts/desktop_l10n.py

@@ -360,8 +360,7 @@ class DesktopSingleLocale(LocalesMixin, AutomationMixin,
         else:
             prop_value = message
         self.set_property(prop_key, prop_value)
-        BaseScript.add_failure(self, locale, message=message,
-                               increment_return_code=False, **kwargs)
+        AutomationMixin.add_failure(self, locale, message=message, **kwargs)
 
     def query_failed_locales(self):
         return [l for l, res in self.locales_property.items() if

testing/mozharness/scripts/mobile_l10n.py

@@ -217,7 +217,7 @@ class MobileSingleLocale(LocalesMixin, TooltoolMixin, AutomationMixin,
         else:
             prop_value = message
         self.set_property(prop_key, prop_value)
-        MercurialScript.add_failure(self, locale, message=message, **kwargs)
+        AutomationMixin.add_failure(self, locale, message=message, **kwargs)
 
     def summary(self):
         MercurialScript.summary(self)