From 6dbf545029c948cd2266336808c6fedf30a7dbbc Mon Sep 17 00:00:00 2001 From: Tom Prince Date: Sat, 7 Mar 2020 02:42:56 +0000 Subject: [PATCH] No bug: [mozharness] Remove unused TryToolsMixin from FxDesktopBuild; r=aki Before Bug 1530908, the build script used `TryToolsMixin.try_message_has_flag` to dectect a request for artifact builds. Since that is no longer used, we can remove the dependency. Differential Revision: https://phabricator.services.mozilla.com/D65842 --HG-- extra : moz-landing-system : lando --- testing/mozharness/scripts/fx_desktop_build.py | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/testing/mozharness/scripts/fx_desktop_build.py b/testing/mozharness/scripts/fx_desktop_build.py index 3dfc0afeb255..1abc3a140e32 100755 --- a/testing/mozharness/scripts/fx_desktop_build.py +++ b/testing/mozharness/scripts/fx_desktop_build.py @@ -13,7 +13,6 @@ author: Jordan Lund """ -import copy import sys import os @@ -23,13 +22,12 @@ sys.path.insert(1, os.path.dirname(sys.path[0])) import mozharness.base.script as script from mozharness.mozilla.building.buildbase import BUILD_BASE_CONFIG_OPTIONS, \ BuildingConfig, BuildScript -from mozharness.mozilla.testing.try_tools import TryToolsMixin, try_config_options -class FxDesktopBuild(BuildScript, TryToolsMixin, object): +class FxDesktopBuild(BuildScript, object): def __init__(self): buildscript_kwargs = { - 'config_options': BUILD_BASE_CONFIG_OPTIONS + copy.deepcopy(try_config_options), + 'config_options': BUILD_BASE_CONFIG_OPTIONS, 'all_actions': [ 'get-secrets', 'clobber', @@ -90,10 +88,6 @@ class FxDesktopBuild(BuildScript, TryToolsMixin, object): # Actions {{{2 - def set_extra_try_arguments(self, action, success=None): - """ Override unneeded method from TryToolsMixin """ - pass - @script.PreScriptRun def suppress_windows_modal_dialogs(self, *args, **kwargs): if self._is_windows():