Bug 1426082 - Remove superfluous transport tests. r?whimboo draft
authorAndreas Tolfsen <ato@sny.no>
Mon, 26 Feb 2018 20:07:59 +0000
changeset 761796 5060a7be372020b1ddffcd439ce1af96a14219ec
parent 761787 e33efdb3e1517d521deb949de3fcd6d9946ea440
child 761797 f51f8d7293c027ab04518041b01d362816da86d1
push id101003
push userbmo:ato@sny.no
push dateThu, 01 Mar 2018 14:31:57 +0000
reviewerswhimboo
bugs1426082, 1409030
milestone60.0a1
Bug 1426082 - Remove superfluous transport tests. r?whimboo This drops the tests for Marionette protocol level 2. Protocol levels below 2 were removed some time ago: https://bugzilla.mozilla.org/show_bug.cgi?id=1409030 MozReview-Commit-ID: GsrdeldnoNH
testing/marionette/harness/marionette_harness/tests/unit/test_transport.py
--- a/testing/marionette/harness/marionette_harness/tests/unit/test_transport.py
+++ b/testing/marionette/harness/marionette_harness/tests/unit/test_transport.py
@@ -1,22 +1,17 @@
 # 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 __future__ import absolute_import
 
 import json
 
-from marionette_driver.transport import (
-    Command,
-    Proto2Command,
-    Proto2Response,
-    Response,
-)
+from marionette_driver.transport import Command, Response
 
 from marionette_harness import MarionetteTestCase
 
 
 get_current_url = ("getCurrentUrl", None)
 execute_script = ("executeScript", {"script": "return 42"})
 
 
@@ -111,51 +106,8 @@ class TestResponse(MessageTestCase):
 
     def test_from_msg(self):
         msg = [Response.TYPE, "msgid", "error", "result"]
         payload = json.dumps(msg)
         resp = Response.from_msg(payload)
         self.assertEquals(msg[1], resp.id)
         self.assertEquals(msg[2], resp.error)
         self.assertEquals(msg[3], resp.result)
-
-
-class TestProto2Command(MessageTestCase):
-    def create(self, name="name", params="params"):
-        return Proto2Command(name, params)
-
-    def test_initialise(self):
-        cmd = self.create()
-        self.assert_attr(cmd, "id")
-        self.assert_attr(cmd, "name")
-        self.assert_attr(cmd, "params")
-        self.assertEqual(None, cmd.id)
-        self.assertEqual("name", cmd.name)
-        self.assertEqual("params", cmd.params)
-
-    def test_from_data_unknown(self):
-        with self.assertRaises(ValueError):
-            cmd = Proto2Command.from_data({})
-
-
-class TestProto2Response(MessageTestCase):
-    def create(self, error="error", result="result"):
-        return Proto2Response(error, result)
-
-    def test_initialise(self):
-        resp = self.create()
-        self.assert_attr(resp, "id")
-        self.assert_attr(resp, "error")
-        self.assert_attr(resp, "result")
-        self.assertEqual(None, resp.id)
-        self.assertEqual("error", resp.error)
-        self.assertEqual("result", resp.result)
-
-    def test_from_data_error(self):
-        data = {"error": "error"}
-        resp = Proto2Response.from_data(data)
-        self.assertEqual(data, resp.error)
-        self.assertEqual(None, resp.result)
-
-    def test_from_data_result(self):
-        resp = Proto2Response.from_data("result")
-        self.assertEqual(None, resp.error)
-        self.assertEqual("result", resp.result)