Bug 1231806 - Fix continuation line under-indented for visual indent. r=ted
authorSimon Gareste <simon@gareste.fr>
Mon, 21 Dec 2015 14:22:06 -0500
changeset 300568 4a8c0bac7bd2db9a9e39eb99116cccc8b4eea62f
parent 300567 6f187e5d5a5394e600397be1754645c7dd0ddb88
child 300569 64191519db53ef052ad1442259ba76419c7c3ce1
push id8978
push userraliiev@mozilla.com
push dateMon, 25 Jan 2016 14:05:32 +0000
treeherdermozilla-aurora@b9a803752a2c [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersted
bugs1231806
milestone46.0a1
Bug 1231806 - Fix continuation line under-indented for visual indent. r=ted
testing/mochitest/mach_commands.py
testing/mochitest/runrobocop.py
--- a/testing/mochitest/mach_commands.py
+++ b/testing/mochitest/mach_commands.py
@@ -559,18 +559,18 @@ class MachCommands(MachCommandBase):
 @CommandProvider
 class RobocopCommands(MachCommandBase):
 
     @Command('robocop', category='testing',
              conditions=[conditions.is_android],
              description='Run a Robocop test.',
              parser=setup_argument_parser)
     @CommandArgument('--serve', default=False, action='store_true',
-        help='Run no tests but start the mochi.test web server and launch '
-             'Fennec with a test profile.')
+                     help='Run no tests but start the mochi.test web server '
+                     'and launch Fennec with a test profile.')
     def run_robocop(self, serve=False, **kwargs):
         if serve:
             kwargs['autorun'] = False
 
         if not kwargs.get('robocopIni'):
             kwargs['robocopIni'] = os.path.join(self.topobjdir, '_tests', 'testing',
                                                 'mochitest', 'robocop.ini')
 
@@ -586,17 +586,17 @@ class RobocopCommands(MachCommandBase):
         driver.install_tests(remove=False)
 
         test_paths = kwargs['test_paths']
         kwargs['test_paths'] = []
 
         from mozbuild.testing import TestResolver
         resolver = self._spawn(TestResolver)
         tests = list(resolver.resolve_tests(paths=test_paths, cwd=self._mach_context.cwd,
-            flavor='instrumentation', subsuite='robocop'))
+                                            flavor='instrumentation', subsuite='robocop'))
 
         mochitest = self._spawn(MochitestRunner)
         return mochitest.run_robocop_test(self._mach_context, tests, 'robocop', **kwargs)
 
 
 # NOTE python/mach/mach/commands/commandinfo.py references this function
 #      by name. If this function is renamed or removed, that file should
 #      be updated accordingly as well.
--- a/testing/mochitest/runrobocop.py
+++ b/testing/mochitest/runrobocop.py
@@ -427,17 +427,17 @@ class RobocopTestRunner(MochitestDesktop
             # that starts Fennec and then waits indefinitely, since cat
             # never returns.
             browserArgs = ["start",
                            "-n", "org.mozilla.roboexample.test/org.mozilla.gecko.LaunchFennecWithConfigurationActivity",
                            "&&", "cat"]
             self.dm.default_timeout = sys.maxint  # Forever.
             self.log.info("")
             self.log.info("Serving mochi.test Robocop root at http://%s:%s/tests/robocop/" %
-                         (self.options.remoteWebServer, self.options.httpPort))
+                          (self.options.remoteWebServer, self.options.httpPort))
             self.log.info("")
         result = -1
         log_result = -1
         try:
             self.dm.recordLogcat()
             result = self.auto.runApp(
                 None, browserEnv, "am", self.localProfile, browserArgs,
                 timeout=self.NO_OUTPUT_TIMEOUT, symbolsPath=self.options.symbolsPath)
@@ -486,17 +486,17 @@ class RobocopTestRunner(MochitestDesktop
             # the httpd server, but not actually run a test.
             self.options.test_paths = [robocop_tests[0]['name']]
         active_tests = []
         for test in robocop_tests:
             if self.options.test_paths and test['name'] not in self.options.test_paths:
                 continue
             if 'disabled' in test:
                 self.log.info('TEST-INFO | skipping %s | %s' %
-                             (test['name'], test['disabled']))
+                              (test['name'], test['disabled']))
                 continue
             active_tests.append(test)
         self.log.suite_start([t['name'] for t in active_tests])
         worstTestResult = None
         for test in active_tests:
             result = self.runSingleTest(test)
             if worstTestResult is None or worstTestResult == 0:
                 worstTestResult = result