Bug 1248916 - Ignore mozdebug.requiresEscapedArgs in mochitest, r?ted draft
authorAndrew Halberstadt <ahalberstadt@mozilla.com>
Wed, 17 Feb 2016 14:33:33 -0500
changeset 331659 9d128fbe2e88026b1767c27d073606a07a73de08
parent 331542 709f559b5406e8555cf84dd09bdc747b076f142c
child 514419 61f2d5dbe3c6f80a4e42e018649098c38afdd8b9
push id11024
push userahalberstadt@mozilla.com
push dateWed, 17 Feb 2016 19:36:19 +0000
reviewersted
bugs1248916
milestone47.0a1
Bug 1248916 - Ignore mozdebug.requiresEscapedArgs in mochitest, r?ted Mochitest no longer passes in debug_args in via the commandline. Instead, it passes them in via a marionette chrome script, meaning they no longer need to be escaped. Since web-platform-tests still passes debug_args on the commandline, we can't simply remove the feature entirely. Instead, just make mochitest ignore requiresEscapedArgs. MozReview-Commit-ID: KBVviGpkvQS
testing/mochitest/runtests.py
--- a/testing/mochitest/runtests.py
+++ b/testing/mochitest/runtests.py
@@ -1923,22 +1923,17 @@ class MochitestDesktop(MochitestBase):
 
             # build command line
             cmd = os.path.abspath(app)
             args = list(extraArgs)
             args.append('-marionette')
             # TODO: mozrunner should use -foreground at least for mac
             # https://bugzilla.mozilla.org/show_bug.cgi?id=916512
             args.append('-foreground')
-            if testUrl:
-                if debuggerInfo and debuggerInfo.requiresEscapedArgs:
-                    testUrl = testUrl.replace("&", "\\&")
-                self.start_script_args.append(testUrl)
-            else:
-                self.start_script_args.append('about:blank')
+            self.start_script_args.append(testUrl or 'about:blank')
 
             if detectShutdownLeaks:
                 shutdownLeaks = ShutdownLeaks(self.log)
             else:
                 shutdownLeaks = None
 
             if mozinfo.info["asan"] and (mozinfo.isLinux or mozinfo.isMac):
                 lsanLeaks = LSANLeaks(self.log)