Bug 803850: sync MarionetteJSTestCase.add_tests_to_suite arguements with others.
☠☠ backed out by 0234f58b6103 ☠ ☠
authorVicamo Yang <vyang@mozilla.com>
Tue, 23 Oct 2012 00:01:41 +0800
changeset 110944 16190e59bc8f3f3456e5de914fc4c1c29a114b41
parent 110943 1ebb05c8a8c8a48dddc6bac6fe9ac03ab637562f
child 110945 0234f58b61034235e504b192ce9332adf3271f2c
push id16830
push uservyang@mozilla.com
push dateMon, 22 Oct 2012 16:01:41 +0000
treeherdermozilla-inbound@16190e59bc8f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs803850
milestone19.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 803850: sync MarionetteJSTestCase.add_tests_to_suite arguements with others.
testing/marionette/client/marionette/marionette_test.py
--- a/testing/marionette/client/marionette/marionette_test.py
+++ b/testing/marionette/client/marionette/marionette_test.py
@@ -148,17 +148,17 @@ class MarionetteJSTestCase(CommonTestCas
     def __init__(self, marionette_weakref, methodName='runTest', jsFile=None):
         assert(jsFile)
         self.jsFile = jsFile
         self._marionette_weakref = marionette_weakref
         self.marionette = None
         CommonTestCase.__init__(self, methodName)
 
     @classmethod
-    def add_tests_to_suite(cls, mod_name, filepath, suite, testloader, marionette):
+    def add_tests_to_suite(cls, mod_name, filepath, suite, testloader, marionette, testvars):
         suite.addTest(cls(weakref.ref(marionette), jsFile=filepath))
 
     def runTest(self):
         if self.marionette.session is None:
             self.marionette.start_session()
         self.marionette.execute_script("log('TEST-START: %s');" % self.jsFile.replace('\\', '\\\\'))
 
         f = open(self.jsFile, 'r')