Bug 1328549 - Fix mochitest import error when running via mach, r=jmaher
authorAndrew Halberstadt <ahalberstadt@mozilla.com>
Wed, 04 Jan 2017 09:39:42 -0500
changeset 355942 a354fb29db49f0538b1f5af810aeeca5d5cda860
parent 355941 558eca1b4460da3b39dbf6f231cb3d33c727b97d
child 355943 bb576b8ab4fa24394e3b60aa9bfda118de9ea833
push id10621
push userjlund@mozilla.com
push dateMon, 23 Jan 2017 16:02:43 +0000
treeherdermozilla-aurora@dca7b42e6c67 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjmaher
bugs1328549
milestone53.0a1
Bug 1328549 - Fix mochitest import error when running via mach, r=jmaher MozReview-Commit-ID: DulWm9tOIBd
testing/mochitest/mach_commands.py
--- a/testing/mochitest/mach_commands.py
+++ b/testing/mochitest/mach_commands.py
@@ -275,17 +275,17 @@ def verify_host_bin():
 
 @CommandProvider
 class MachCommands(MachCommandBase):
     @Command('mochitest', category='testing',
              conditions=[is_buildapp_in(*SUPPORTED_APPS)],
              description='Run any flavor of mochitest (integration test).',
              parser=setup_argument_parser)
     def run_mochitest_general(self, flavor=None, test_objects=None, resolve_tests=True, **kwargs):
-        from mochitest.mochitest_options import ALL_FLAVORS
+        from mochitest_options import ALL_FLAVORS
 
         buildapp = None
         for app in SUPPORTED_APPS:
             if is_buildapp_in(app)(self):
                 buildapp = app
                 break
 
         flavors = None