Commit 02f46eda authored by Joel Maher's avatar Joel Maher
Browse files

Bug 811444 - panda boards magically reboot in the middle of the test. r=ted

parent 46c89ae2

testing/mochitest/runtests.py

+7 −0
Original line number Diff line number Diff line
@@ -246,6 +246,11 @@ class MochitestOptions(optparse.OptionParser): 
                    help = "Filename of the output file where we can store a .json list of failures to be run in the future with --run-only-tests.")

    defaults["failureFile"] = None



    self.add_option("--run-slower",

                    action = "store_true", dest = "runSlower",

                    help = "Delay execution between test files.")

    defaults["runSlower"] = False



    # -h, --help are automatically handled by OptionParser



    self.set_defaults(**defaults)
@@ -639,6 +644,8 @@ class Mochitest(object): 
          self.urlOpts.append("runOnly=false")

      if options.failureFile:

        self.urlOpts.append("failureFile=%s" % self.getFullPath(options.failureFile))

      if options.runSlower:

        self.urlOpts.append("runSlower=true")



  def cleanup(self, manifest, options):

    """ remove temporary files and profile """

testing/mochitest/runtestsremote.py

+1 −0
Original line number Diff line number Diff line
@@ -302,6 +302,7 @@ class MochiRemote(Mochitest): 
        self.localLog = options.logFile

        options.logFile = self.remoteLog

        options.profilePath = self.localProfile

        env["MOZ_HIDE_RESULTS_TABLE"] = 1

        retVal = Mochitest.buildURLOptions(self, options, env)

        #we really need testConfig.js (for browser chrome)

        try:

testing/mochitest/tests/SimpleTest/TestRunner.js

+6 −1
Original line number Diff line number Diff line
@@ -78,6 +78,7 @@ TestRunner._urls = []; 


TestRunner.timeout = 5 * 60 * 1000; // 5 minutes.

TestRunner.maxTimeouts = 4; // halt testing after too many timeouts

TestRunner.runSlower = false;



TestRunner._expectingProcessCrash = false;
@@ -440,8 +441,12 @@ TestRunner.testFinished = function(tests) { 


        TestRunner.updateUI(tests);

        TestRunner._currentTest++;

        if (TestRunner.runSlower) {

            setTimeout(TestRunner.runNextTest, 1000);

        } else {

            TestRunner.runNextTest();

        }

    }



    SpecialPowers.executeAfterFlushingMessageQueue(function() {

        cleanUpCrashDumpFiles();

testing/mochitest/tests/SimpleTest/setup.js

+6 −0
Original line number Diff line number Diff line
@@ -104,6 +104,12 @@ if (!params.quiet) { 
  TestRunner.logger.addListener("dumpListener", consoleLevel + "", dumpListener);

}



// A temporary hack for android 4.0 where Fennec utilizes the pandaboard so much it reboots

if (params.runSlower) {

  TestRunner.runSlower = true;

}





var gTestList = [];

var RunSet = {}

RunSet.runall = function(e) {