Bug 1328549 - Fix mochitest import error when running via mach, r?jmaher draft
authorAndrew Halberstadt <ahalberstadt@mozilla.com>
Wed, 04 Jan 2017 09:39:42 -0500
changeset 455903 74152fac24e676ec542f854f997c967dc702c5e5
parent 455536 57ac9f63fc6953f4efeb0cc84a60192d3721251f
child 541074 d83e2776e76466fe8a1946716dea2d344940f154
push id40328
push userahalberstadt@mozilla.com
push dateWed, 04 Jan 2017 14:40:37 +0000
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