Bug 785273 - Fix MarionetteJS case breakage, a=test-only, DONTBUILD because NPOTB
authorJonathan Griffin <jgriffin@mozilla.com>
Mon, 27 Aug 2012 09:34:23 -0700
changeset 105575 e934a9d8be1f2c82d36234d007193e6c87290969
parent 105574 49aded7afc77808e3e6c6917e9fe0cc48d3e376f
child 105576 257e181b2a96d2afbd1bfa82c7ee27333dd4d920
child 105614 158ffe78995bd7345f6e160d1de2b206b68d410e
push id55
push usershu@rfrn.org
push dateThu, 30 Aug 2012 01:33:09 +0000
reviewerstest-only, DONTBUILD
bugs785273
milestone17.0a1
Bug 785273 - Fix MarionetteJS case breakage, a=test-only, DONTBUILD because NPOTB
testing/marionette/client/marionette/marionette_test.py
--- a/testing/marionette/client/marionette/marionette_test.py
+++ b/testing/marionette/client/marionette/marionette_test.py
@@ -112,20 +112,21 @@ class MarionetteTestCase(CommonTestCase)
 
 
 class MarionetteJSTestCase(CommonTestCase):
 
     context_re = re.compile(r"MARIONETTE_CONTEXT(\s*)=(\s*)['|\"](.*?)['|\"];")
     timeout_re = re.compile(r"MARIONETTE_TIMEOUT(\s*)=(\s*)(\d+);")
     launch_re = re.compile(r"MARIONETTE_LAUNCH_APP(\s*)=(\s*)['|\"](.*?)['|\"];")
 
-    def __init__(self, marionette, methodName='runTest', jsFile=None):
+    def __init__(self, marionette_weakref, methodName='runTest', jsFile=None):
         assert(jsFile)
         self.jsFile = jsFile
-        self.marionette = marionette
+        self._marionette_weakref = marionette_weakref
+        self.marionette = None
         CommonTestCase.__init__(self, methodName)
 
     def runTest(self):
         if self.marionette.session is None:
             self.marionette.start_session()
         f = open(self.jsFile, 'r')
         js = f.read()
         args = []