Bug 1370863 - Stop using Marionette.log API in harness; r=automatedtester

MozReview-Commit-ID: 33ZPdJ486rJ

--HG--
extra : rebase_source : e5cff00c41f09afb8f01d18d830bc601cb5a6171

testing/marionette/harness/marionette_harness/marionette_test/testcases.py

@@ -72,7 +72,6 @@ class CommonTestCase(unittest.TestCase):
         self._marionette_weakref = marionette_weakref
         self.fixtures = fixtures
 
-        self.loglines = []
         self.duration = 0
         self.start_time = 0
         self.expected = kwargs.pop('expected', 'pass')
@@ -251,22 +250,17 @@ class CommonTestCase(unittest.TestCase):
         super(CommonTestCase, self).setUp()
 
     def cleanTest(self):
-        self._deleteSession()
+        self._delete_session()
 
-    def _deleteSession(self):
-        if hasattr(self, 'start_time'):
+    def _delete_session(self):
+        if hasattr(self, "start_time"):
             self.duration = time.time() - self.start_time
-        if hasattr(self.marionette, 'session'):
-            if self.marionette.session is not None:
-                try:
-                    self.loglines.extend(self.marionette.get_logs())
-                except Exception, inst:
-                    self.loglines = [['Error getting log: {}'.format(inst)]]
-                try:
-                    self.marionette.delete_session()
-                except IOError:
-                    # Gecko has crashed?
-                    pass
+        if self.marionette.session is not None:
+            try:
+                self.marionette.delete_session()
+            except IOError:
+                # Gecko has crashed?
+                pass
         self.marionette = None
 
 
@@ -317,7 +311,7 @@ class MarionetteTestCase(CommonTestCase):
     def setUp(self):
         super(MarionetteTestCase, self).setUp()
         self.marionette.test_name = self.test_name
-        self.marionette.execute_script("log('TEST-START: {0}')"
+        self.marionette.execute_script("dump('TEST-START: {0}')"
                                        .format(self.test_name),
                                        sandbox="simpletest")
 
@@ -329,7 +323,7 @@ class MarionetteTestCase(CommonTestCase):
 
         if not self.marionette.crashed:
             try:
-                self.marionette.execute_script("log('TEST-END: {0}')"
+                self.marionette.execute_script("dump('TEST-END: {0}')"
                                                .format(self.test_name),
                                                sandbox="simpletest")
                 self.marionette.test_name = None

testing/marionette/harness/marionette_harness/tests/unit/test_log.py

@@ -1,64 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-from marionette_harness import MarionetteTestCase
-
-
-class TestLog(MarionetteTestCase):
-    def setUp(self):
-        MarionetteTestCase.setUp(self)
-        # clears log cache
-        self.marionette.get_logs()
-
-    def test_log(self):
-        self.marionette.log("foo")
-        logs = self.marionette.get_logs()
-        self.assertEqual("INFO", logs[0][0])
-        self.assertEqual("foo", logs[0][1])
-
-    def test_log_level(self):
-        self.marionette.log("foo", "ERROR")
-        logs = self.marionette.get_logs()
-        self.assertEqual("ERROR", logs[0][0])
-        self.assertEqual("foo", logs[0][1])
-
-    def test_clear(self):
-        self.marionette.log("foo")
-        self.assertEqual(1, len(self.marionette.get_logs()))
-        self.assertEqual(0, len(self.marionette.get_logs()))
-
-    def test_multiple_entries(self):
-        self.marionette.log("foo")
-        self.marionette.log("bar")
-        self.assertEqual(2, len(self.marionette.get_logs()))
-
-    def test_log_from_sync_script(self):
-        self.marionette.execute_script("log('foo')")
-        logs = self.marionette.get_logs()
-        self.assertEqual("INFO", logs[0][0])
-        self.assertEqual("foo", logs[0][1])
-
-    def test_log_from_sync_script_level(self):
-        self.marionette.execute_script("log('foo', 'ERROR')")
-        logs = self.marionette.get_logs()
-        self.assertEqual("ERROR", logs[0][0])
-        self.assertEqual("foo", logs[0][1])
-
-    def test_log_from_async_script(self):
-        self.marionette.execute_async_script("log('foo'); arguments[0]();")
-        logs = self.marionette.get_logs()
-        self.assertEqual("INFO", logs[0][0])
-        self.assertEqual("foo", logs[0][1])
-
-    def test_log_from_async_script_variable_arguments(self):
-        self.marionette.execute_async_script("log('foo', 'ERROR'); arguments[0]();")
-        logs = self.marionette.get_logs()
-        self.assertEqual("ERROR", logs[0][0])
-        self.assertEqual("foo", logs[0][1])
-
-
-class TestLogChrome(TestLog):
-    def setUp(self):
-        TestLog.setUp(self)
-        self.marionette.set_context("chrome")

testing/marionette/harness/marionette_harness/tests/unit/unit-tests.ini

@@ -29,8 +29,6 @@ skip-if = true # "Bug 896046"
 [test_clearing.py]
 [test_typing.py]
 
-[test_log.py]
-
 [test_execute_async_script.py]
 [test_execute_script.py]
 [test_element_retrieval.py]