780641 - Bug 728294 breaks B2G mochitests

Status: RESOLVED FIXED

(Testing :: Mochitest, defect)

Description

[Jonathan Griffin (:jgriffin)]

http://hg.mozilla.org/mozilla-central/rev/c10c3ac392d5 (from bug 728294) changed the signature of mochitest's waitForFinish method, but it didn't change the override that B2G uses in http://mxr.mozilla.org/mozilla-central/source/build/mobile/b2gautomation.py#108. 

As a result, attempting to run mochitests on B2G fails with:

Traceback (most recent call last):
  File "/data/jenkins/workspace/mochitest/objdir-gecko/_tests/testing/mochitest/runtests.py", line 695, in runTests
    timeout = timeout)
  File "/data/jenkins/workspace/mochitest/objdir-gecko/_tests/testing/mochitest/automation.py", line 993, in runApp
    status = self.waitForFinish(proc, utilityPath, timeout, maxTime, startTime, debuggerInfo, symbolsPath)
TypeError: waitForFinish() takes exactly 9 arguments (8 given)

Comment 1

[Tim Taubert [:ttaubert] (inactive)]

Attachment: trivial patch

Oops, sorry :/

Comment 2

[Jonathan Griffin (:jgriffin)]

Comment on attachment 649329 [details] [diff] [review]
trivial patch

Thanks; I just verified the tests work after this patch.

Comment 3

[Jonathan Griffin (:jgriffin)]

I'm going to take the liberty of landing this directly in m-c, to unbreak the tests.

Comment 4

[Tim Taubert [:ttaubert] (inactive)]

(In reply to Jonathan Griffin (:jgriffin) from comment #3)
> I'm going to take the liberty of landing this directly in m-c, to unbreak
> the tests.

Awesome, thanks.

Comment 5

[Jonathan Griffin (:jgriffin)]

https://hg.mozilla.org/mozilla-central/rev/cdc84c93ffe3