Commit 12a32ed2 authored by Kyle Huey's avatar Kyle Huey
Browse files

Bug 732481: Remove the EM restart from the reftest harness. r=dbaron

parent c2383f11

layout/tools/reftest/remotereftest.py

+0 −17
Original line number Diff line number Diff line
@@ -364,23 +364,6 @@ user_pref("capability.principal.codebase.p2.id", "http://%s:%s"); 
        if (self._devicemanager.pushDir(profileDir, options.remoteProfile) == None):

            raise devicemanager.FileError("Failed to copy extra files to device") 



    def registerExtension(self, browserEnv, options, profileDir, extraArgs = ['-silent'] ):

        if options.bootstrap:

            return



        self.automation.log.info("REFTEST INFO | runreftest.py | Performing extension manager registration: start.\n")

        # Because our startProcess code doesn't return until fennec starts we just give it

        # a maxTime of 20 secs before timing it out and ensuring it is dead.

        # Besides registering the extension, this works around fennec bug 570027

        status = self.automation.runApp(None, browserEnv, options.app, profileDir,

                                   extraArgs,

                                   utilityPath = options.utilityPath,

                                   xrePath=options.xrePath,

                                   symbolsPath=options.symbolsPath,

                                   maxTime = 20)

        # We don't care to call |processLeakLog()| for this step.

        self.automation.log.info("\nREFTEST INFO | runreftest.py | Performing extension manager registration: end.")



    def getManifestPath(self, path):

        return path

layout/tools/reftest/runreftest.py

+0 −22
Original line number Diff line number Diff line
@@ -113,25 +113,6 @@ class RefTest(object): 
                                                  profileDir,

                                                  "reftest@mozilla.org")





  def registerExtension(self, browserEnv, options, profileDir, extraArgs = ['-silent']):

    # run once with -silent to let the extension manager do its thing

    # and then exit the app

    self.automation.log.info("REFTEST INFO | runreftest.py | Performing extension manager registration: start.\n")

    # Don't care about this |status|: |runApp()| reporting it should be enough.

    status = self.automation.runApp(None, browserEnv, options.app, profileDir,

                                 extraArgs,

                                 utilityPath = options.utilityPath,

                                 xrePath=options.xrePath,

                                 symbolsPath=options.symbolsPath)

    # We don't care to call |processLeakLog()| for this step.

    self.automation.log.info("\nREFTEST INFO | runreftest.py | Performing extension manager registration: end.")



    # Remove the leak detection file so it can't "leak" to the tests run.

    # The file is not there if leak logging was not enabled in the application build.

    if os.path.exists(self.leakLogFile):

      os.remove(self.leakLogFile)



  def buildBrowserEnv(self, options, profileDir):

    browserEnv = self.automation.environment(xrePath = options.xrePath)

    browserEnv["XPCOM_DEBUG_BREAK"] = "stack"
@@ -162,9 +143,6 @@ class RefTest(object): 
      # browser environment

      browserEnv = self.buildBrowserEnv(options, profileDir)



      self.registerExtension(browserEnv, options, profileDir)



      # then again to actually run reftest

      self.automation.log.info("REFTEST INFO | runreftest.py | Running tests: start.\n")

      status = self.automation.runApp(None, browserEnv, options.app, profileDir,

                                 cmdlineArgs,