Bug 1104742 - Marionette runner should cleanup marionette objects when gc'ed, r=AutomatedTester
authorAndrew Halberstadt <ahalberstadt@mozilla.com>
Thu, 04 Dec 2014 10:17:12 -0800
changeset 218440 92d3bf8747e8d23bd43aca47b3b89cca6d948ecb
parent 218439 d42a1fc52756e2a374f67483ced04d64d91b4bc0
child 218441 3a7cfe0628b540f3b01b22e6faadb6b0353126b6
push idunknown
push userunknown
push dateunknown
reviewersAutomatedTester
bugs1104742
milestone37.0a1
Bug 1104742 - Marionette runner should cleanup marionette objects when gc'ed, r=AutomatedTester
testing/marionette/client/marionette/runner/base.py
--- a/testing/marionette/client/marionette/runner/base.py
+++ b/testing/marionette/client/marionette/runner/base.py
@@ -937,16 +937,19 @@ setReq.onerror = function() {
             self.tests = chunks[self.this_chunk - 1]
 
         self.run_test_set(self.tests)
 
     def cleanup(self):
         if self.httpd:
             self.httpd.stop()
 
+        if self.marionette:
+            self.marionette.cleanup()
+
     __del__ = cleanup
 
     def generate_xml(self, results_list):
 
         def _extract_xml_from_result(test_result, result='passed'):
             _extract_xml(
                 test_name=unicode(test_result.name).split()[0],
                 test_class=test_result.test_class,