Bug 1573393 - Remove deprecated Firefox UI security tests. r=johannh
authorHenrik Skupin <mail@hskupin.info>
Thu, 15 Aug 2019 07:42:27 +0000
changeset 488196 3fff9f16b14d9f78c281aec7ac16ecdbd0348c1f
parent 488195 eb56d88d1b0758babf0ba4ac55fe261481833f09
child 488197 fa0807f1afad6b15d1675687a50777886c3e2a2a
push id113904
push userncsoregi@mozilla.com
push dateThu, 15 Aug 2019 19:41:00 +0000
treeherdermozilla-inbound@b283a7ef186c [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjohannh
bugs1573393
milestone70.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 1573393 - Remove deprecated Firefox UI security tests. r=johannh Differential Revision: https://phabricator.services.mozilla.com/D41833
testing/firefox-ui/tests/functional/security/manifest.ini
testing/firefox-ui/tests/functional/security/test_dv_certificate.py
testing/firefox-ui/tests/functional/security/test_ev_certificate.py
testing/firefox-ui/tests/functional/security/test_mixed_content_page.py
testing/firefox-ui/tests/functional/security/test_mixed_script_content_blocking.py
testing/firefox-ui/tests/functional/security/test_no_certificate.py
testing/firefox-ui/tests/functional/security/test_security_notification.py
testing/firefox-ui/tests/functional/security/test_ssl_disabled_error_page.py
testing/firefox-ui/tests/functional/security/test_submit_unencrypted_info_warning.py
testing/firefox-ui/tests/functional/security/test_unknown_issuer.py
testing/firefox-ui/tests/functional/security/test_untrusted_connection_error_page.py
--- a/testing/firefox-ui/tests/functional/security/manifest.ini
+++ b/testing/firefox-ui/tests/functional/security/manifest.ini
@@ -1,20 +1,6 @@
 [DEFAULT]
 tags = remote
 
-[test_dv_certificate.py]
-skip-if = true # bug 1523133
 [test_enable_privilege.py]
 tags = local
-[test_ev_certificate.py]
-skip-if = true # bug 1523133
-[test_mixed_content_page.py]
-[test_mixed_script_content_blocking.py]
-[test_no_certificate.py]
-skip-if = true # bug 1523133
-tags = local
-[test_security_notification.py]
-[test_ssl_disabled_error_page.py]
 [test_ssl_status_after_restart.py]
-[test_submit_unencrypted_info_warning.py]
-[test_unknown_issuer.py]
-[test_untrusted_connection_error_page.py]
deleted file mode 100644
--- a/testing/firefox-ui/tests/functional/security/test_dv_certificate.py
+++ /dev/null
@@ -1,87 +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 __future__ import absolute_import
-from firefox_puppeteer import PuppeteerMixin
-from marionette_driver import Wait
-from marionette_harness import MarionetteTestCase
-
-
-class TestDVCertificate(PuppeteerMixin, MarionetteTestCase):
-
-    def setUp(self):
-        super(TestDVCertificate, self).setUp()
-
-        self.locationbar = self.browser.navbar.locationbar
-        self.identity_popup = self.browser.navbar.locationbar.identity_popup
-
-        self.url = 'https://mozilla-intermediate.badssl.com'
-
-    def tearDown(self):
-        try:
-            self.browser.switch_to()
-            self.identity_popup.close(force=True)
-            self.puppeteer.windows.close_all([self.browser])
-        finally:
-            super(TestDVCertificate, self).tearDown()
-
-    def test_dv_cert(self):
-        with self.marionette.using_context('content'):
-            self.marionette.navigate(self.url)
-
-        self.assertEqual(self.locationbar.identity_box.get_property('className'),
-                         'verifiedDomain')
-
-        # Open the identity popup
-        self.locationbar.open_identity_popup()
-
-        # Check the identity popup doorhanger
-        self.assertEqual(self.identity_popup.element.get_attribute('connection'), 'secure')
-
-        cert = self.browser.tabbar.selected_tab.certificate
-
-        # The shown host equals to the certificate
-        self.assertRegexpMatches(self.identity_popup.view.main.header.get_property('textContent'),
-                                 '.*badssl\.com$')
-        self.assertRegexpMatches(cert['commonName'], '.*badssl\.com$')
-
-        # Only the secure label is visible in the main view
-        secure_label = self.identity_popup.view.main.secure_connection_label
-        self.assertNotEqual(secure_label.value_of_css_property('display'), 'none')
-
-        insecure_label = self.identity_popup.view.main.insecure_connection_label
-        self.assertEqual(insecure_label.value_of_css_property('display'), 'none')
-
-        self.identity_popup.view.main.expander.click()
-        Wait(self.marionette).until(
-            lambda _: self.identity_popup.view.security.selected,
-            message='Security view of identity popup has not been selected.')
-
-        # Only the secure label is visible in the security view
-        secure_label = self.identity_popup.view.security.secure_connection_label
-        self.assertNotEqual(secure_label.value_of_css_property('display'), 'none')
-
-        insecure_label = self.identity_popup.view.security.insecure_connection_label
-        self.assertEqual(insecure_label.value_of_css_property('display'), 'none')
-
-        verifier_label = self.browser.localize_property('identity.identified.verifier')
-        self.assertEqual(self.identity_popup.view.security.verifier.get_property('textContent'),
-                         verifier_label.replace("%S", cert['issuerOrganization']))
-
-        def opener(mn):
-            self.identity_popup.view.security.more_info_button.click()
-
-        page_info_window = self.browser.open_page_info_window(opener)
-        deck = page_info_window.deck
-
-        self.assertEqual(deck.selected_panel, deck.security)
-
-        self.assertRegexpMatches(deck.security.domain.get_property('value'),
-                                 '.*badssl\.com$')
-
-        self.assertEqual(deck.security.owner.get_property('value'),
-                         page_info_window.localize_property('securityNoOwner'))
-
-        self.assertEqual(deck.security.verifier.get_property('value'),
-                         cert['issuerOrganization'])
deleted file mode 100644
--- a/testing/firefox-ui/tests/functional/security/test_ev_certificate.py
+++ /dev/null
@@ -1,113 +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 __future__ import absolute_import
-from firefox_puppeteer import PuppeteerMixin
-from marionette_driver import Wait
-from marionette_harness import MarionetteTestCase
-
-
-class TestEVCertificate(PuppeteerMixin, MarionetteTestCase):
-
-    def setUp(self):
-        super(TestEVCertificate, self).setUp()
-
-        self.locationbar = self.browser.navbar.locationbar
-        self.identity_popup = self.locationbar.identity_popup
-
-        self.url = 'https://extended-validation.badssl.com'
-
-    def tearDown(self):
-        try:
-            self.browser.switch_to()
-            self.identity_popup.close(force=True)
-            self.puppeteer.windows.close_all([self.browser])
-        finally:
-            super(TestEVCertificate, self).tearDown()
-
-    def test_ev_certificate(self):
-        with self.marionette.using_context('content'):
-            self.marionette.navigate(self.url)
-
-        # Check the identity box
-        self.assertEqual(self.locationbar.identity_box.get_property('className'),
-                         'verifiedIdentity')
-
-        # Get the information from the certificate
-        cert = self.browser.tabbar.selected_tab.certificate
-        address = self.puppeteer.security.get_address_from_certificate(cert)
-
-        # Check the identity popup label displays
-        self.assertEqual(self.locationbar.identity_organization_label.get_property('value'),
-                         cert['organization'])
-        self.assertEqual(self.locationbar.identity_country_label.get_property('value'),
-                         '(' + address['country'] + ')')
-
-        # Open the identity popup
-        self.locationbar.open_identity_popup()
-
-        # Check the idenity popup doorhanger
-        self.assertEqual(self.identity_popup.element.get_attribute('connection'), 'secure-ev')
-
-        # For EV certificates, the hostname is shown
-        self.assertRegexpMatches(self.identity_popup.view.main.header.get_property('textContent'),
-                                 '.*badssl\.com$')
-
-        # Only the secure label is visible in the main view
-        secure_label = self.identity_popup.view.main.secure_connection_label
-        self.assertNotEqual(secure_label.value_of_css_property('display'), 'none')
-
-        insecure_label = self.identity_popup.view.main.insecure_connection_label
-        self.assertEqual(insecure_label.value_of_css_property('display'), 'none')
-
-        self.identity_popup.view.main.expander.click()
-        Wait(self.marionette).until(lambda _: self.identity_popup.view.security.selected)
-
-        security_view = self.identity_popup.view.security
-
-        # Only the secure label is visible in the security view
-        secure_label = security_view.secure_connection_label
-        self.assertNotEqual(secure_label.value_of_css_property('display'), 'none')
-
-        insecure_label = security_view.insecure_connection_label
-        self.assertEqual(insecure_label.value_of_css_property('display'), 'none')
-
-        # Check the organization name
-        self.assertEqual(security_view.owner.get_property('textContent'), cert['organization'])
-
-        # Check the owner location string
-        # More information:
-        # hg.mozilla.org/mozilla-central/file/eab4a81e4457/browser/base/content/browser.js#l7012
-        location = self.browser.localize_property('identity.identified.state_and_country')
-        location = location.replace('%S', address['state'], 1).replace('%S', address['country'])
-        location = address['city'] + '\n' + location
-        self.assertEqual(security_view.owner_location.get_property('textContent'), location)
-
-        # Check the verifier
-        l10n_verifier = self.browser.localize_property('identity.identified.verifier')
-        l10n_verifier = l10n_verifier.replace('%S', cert['issuerOrganization'])
-        self.assertEqual(security_view.verifier.get_property('textContent'), l10n_verifier)
-
-        # Open the Page Info window by clicking the More Information button
-        page_info = self.browser.open_page_info_window(
-            lambda _: self.identity_popup.view.security.more_info_button.click())
-
-        try:
-            # Verify that the current panel is the security panel
-            self.assertEqual(page_info.deck.selected_panel, page_info.deck.security)
-
-            # Verify the domain listed on the security panel
-            self.assertIn(cert['commonName'],
-                          page_info.deck.security.domain.get_property('value'))
-
-            # Verify the owner listed on the security panel
-            self.assertEqual(page_info.deck.security.owner.get_property('value'),
-                             cert['organization'])
-
-            # Verify the verifier listed on the security panel
-            self.assertEqual(page_info.deck.security.verifier.get_property('value'),
-                             cert['issuerOrganization'])
-        finally:
-            page_info.close()
-            self.browser.focus()
deleted file mode 100644
--- a/testing/firefox-ui/tests/functional/security/test_mixed_content_page.py
+++ /dev/null
@@ -1,61 +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 __future__ import absolute_import
-from firefox_puppeteer import PuppeteerMixin
-from marionette_harness import MarionetteTestCase
-
-
-class TestMixedContentPage(PuppeteerMixin, MarionetteTestCase):
-
-    def setUp(self):
-        super(TestMixedContentPage, self).setUp()
-
-        self.marionette.set_pref('security.mixed_content.upgrade_display_content', False)
-
-        self.locationbar = self.browser.navbar.locationbar
-        self.identity_popup = self.locationbar.identity_popup
-
-        self.url = 'https://mixed.badssl.com'
-
-    def tearDown(self):
-        try:
-            self.marionette.clear_pref('security.mixed_content.upgrade_display_content')
-
-            self.identity_popup.close(force=True)
-        finally:
-            super(TestMixedContentPage, self).tearDown()
-
-    def test_mixed_content(self):
-        with self.marionette.using_context('content'):
-            self.marionette.navigate(self.url)
-
-        self.assertEqual(self.locationbar.identity_box.get_property('className'),
-                         'unknownIdentity mixedDisplayContent')
-
-        # Open the identity popup
-        self.locationbar.open_identity_popup()
-
-        # Only the insecure label is visible in the main view
-        secure_label = self.identity_popup.view.main.secure_connection_label
-        self.assertEqual(secure_label.value_of_css_property('display'), 'none')
-
-        insecure_label = self.identity_popup.view.main.insecure_connection_label
-        self.assertNotEqual(insecure_label.value_of_css_property('display'), 'none')
-
-        # TODO: Bug 1177417 - Needs to open and close the security view, but a second
-        # click on the expander doesn't hide the security view
-        # self.identity_popup.view.main.expander.click()
-        # Wait(self.marionette).until(lambda _: self.identity_popup.view.security.selected)
-
-        # Only the insecure label is visible in the security view
-        secure_label = self.identity_popup.view.security.secure_connection_label
-        self.assertEqual(secure_label.value_of_css_property('display'), 'none')
-
-        insecure_label = self.identity_popup.view.security.insecure_connection_label
-        self.assertNotEqual(insecure_label.value_of_css_property('display'), 'none')
-
-        # owner is not visible
-        owner = self.identity_popup.view.security.owner
-        self.assertEqual(owner.value_of_css_property('display'), 'none')
deleted file mode 100644
--- a/testing/firefox-ui/tests/functional/security/test_mixed_script_content_blocking.py
+++ /dev/null
@@ -1,88 +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 __future__ import absolute_import
-from firefox_puppeteer import PuppeteerMixin
-from marionette_driver import By, Wait
-from marionette_harness import MarionetteTestCase
-
-
-class TestMixedScriptContentBlocking(PuppeteerMixin, MarionetteTestCase):
-
-    def setUp(self):
-        super(TestMixedScriptContentBlocking, self).setUp()
-
-        self.url = 'https://mixed-content-tests-mozilla.org/mozqa/mixed_content_blocked/'
-
-        self.test_elements = [
-            ('result1', 'Insecure script one'),
-            ('result2', 'Insecure script from iFrame'),
-            ('result3', 'Insecure plugin'),
-            ('result4', 'Insecure stylesheet'),
-        ]
-
-        self.locationbar = self.browser.navbar.locationbar
-        self.identity_popup = self.locationbar.identity_popup
-
-    def tearDown(self):
-        try:
-            self.identity_popup.close(force=True)
-        finally:
-            super(TestMixedScriptContentBlocking, self).tearDown()
-
-    def _expect_protection_status(self, enabled):
-        if enabled:
-            color, identity, state = (
-                'rgb(0, 136, 0)',
-                'verifiedDomain mixedActiveBlocked',
-                'blocked'
-            )
-        else:
-            color, identity, state = (
-                'rgb(255, 0, 0)',
-                'unknownIdentity mixedActiveContent',
-                'unblocked'
-            )
-
-        # First call to Wait() needs a longer timeout due to the reload of the web page.
-        Wait(self.marionette, timeout=self.marionette.timeout.page_load).until(
-            lambda _: self.locationbar.identity_box.get_property('className') == identity,
-            message='Expected identity "{}" not found'.format(identity)
-        )
-
-        with self.marionette.using_context('content'):
-            for identifier, description in self.test_elements:
-                el = self.marionette.find_element(By.ID, identifier)
-                Wait(self.marionette).until(
-                    lambda mn: el.value_of_css_property('color') == color,
-                    message=("%s has been %s" % (description, state))
-                )
-
-    def expect_protection_enabled(self):
-        self._expect_protection_status(True)
-
-    def expect_protection_disabled(self):
-        self._expect_protection_status(False)
-
-    def test_mixed_content_page(self):
-        with self.marionette.using_context('content'):
-            self.marionette.navigate(self.url)
-
-        self.expect_protection_enabled()
-
-        # Disable mixed content blocking via identity popup
-        self.locationbar.open_identity_popup()
-        self.identity_popup.view.main.expander.click()
-        Wait(self.marionette).until(lambda _: self.identity_popup.view.security.selected)
-
-        disable_button = self.identity_popup.view.security.disable_mixed_content_blocking_button
-        disable_button.click()
-
-        self.expect_protection_disabled()
-
-        # A reload keeps blocking disabled
-        with self.marionette.using_context('content'):
-            self.marionette.navigate(self.url)
-
-        self.expect_protection_disabled()
deleted file mode 100644
--- a/testing/firefox-ui/tests/functional/security/test_no_certificate.py
+++ /dev/null
@@ -1,82 +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 __future__ import absolute_import
-from urlparse import urlparse
-
-from firefox_puppeteer import PuppeteerMixin
-from marionette_driver import expected, Wait
-from marionette_harness import MarionetteTestCase
-
-
-class TestNoCertificate(PuppeteerMixin, MarionetteTestCase):
-
-    def setUp(self):
-        super(TestNoCertificate, self).setUp()
-
-        self.locationbar = self.browser.navbar.locationbar
-        self.identity_popup = self.locationbar.identity_popup
-
-        self.url = self.marionette.absolute_url('layout/mozilla.html')
-
-    def tearDown(self):
-        try:
-            self.browser.switch_to()
-            self.identity_popup.close(force=True)
-            self.puppeteer.windows.close_all([self.browser])
-        finally:
-            super(TestNoCertificate, self).tearDown()
-
-    def test_no_certificate(self):
-        with self.marionette.using_context('content'):
-            self.marionette.navigate(self.url)
-
-        # Check the favicon
-        # TODO: find a better way to check, e.g., mozmill's isDisplayed
-        favicon_hidden = self.marionette.execute_script("""
-          return arguments[0].hasAttribute("hidden");
-        """, script_args=[self.browser.navbar.locationbar.identity_icon])
-        self.assertFalse(favicon_hidden, 'The identity icon is visible')
-
-        # Check that the identity box organization label is blank
-        self.assertEqual(self.locationbar.identity_organization_label.get_property('value'), '',
-                         'The organization has no label')
-
-        # Open the identity popup
-        self.locationbar.open_identity_popup()
-
-        # Check the idenity popup doorhanger
-        self.assertEqual(self.identity_popup.element.get_attribute('connection'), 'not-secure')
-
-        # The expander for the security view does not exist
-        expected.element_not_present(lambda m: self.identity_popup.main.expander)
-
-        # Only the insecure label is visible
-        secure_label = self.identity_popup.view.main.secure_connection_label
-        self.assertEqual(secure_label.value_of_css_property('display'), 'none')
-
-        insecure_label = self.identity_popup.view.main.insecure_connection_label
-        self.assertNotEqual(insecure_label.value_of_css_property('display'), 'none')
-
-        self.identity_popup.view.main.expander.click()
-        Wait(self.marionette).until(lambda _: self.identity_popup.view.security.selected)
-
-        # Open the Page Info window by clicking the "More Information" button
-        page_info = self.browser.open_page_info_window(
-            lambda _: self.identity_popup.view.security.more_info_button.click())
-
-        # Verify that the current panel is the security panel
-        self.assertEqual(page_info.deck.selected_panel, page_info.deck.security)
-
-        # Check the domain listed on the security panel contains the url's host name
-        self.assertIn(urlparse(self.url).hostname,
-                      page_info.deck.security.domain.get_property('value'))
-
-        # Check the owner label equals localized 'securityNoOwner'
-        self.assertEqual(page_info.deck.security.owner.get_property('value'),
-                         page_info.localize_property('securityNoOwner'))
-
-        # Check the verifier label equals localized 'notset'
-        self.assertEqual(page_info.deck.security.verifier.get_property('value'),
-                         page_info.localize_property('notset'))
deleted file mode 100644
--- a/testing/firefox-ui/tests/functional/security/test_security_notification.py
+++ /dev/null
@@ -1,63 +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 __future__ import absolute_import
-import time
-
-from firefox_puppeteer import PuppeteerMixin
-from marionette_driver import By, Wait
-from marionette_driver.errors import MarionetteException
-from marionette_harness import MarionetteTestCase
-
-
-class TestSecurityNotification(PuppeteerMixin, MarionetteTestCase):
-
-    def setUp(self):
-        super(TestSecurityNotification, self).setUp()
-
-        self.urls = [
-            # Invalid cert page
-            'https://expired.badssl.com',
-            # Secure page
-            'https://badssl.com',
-            # Insecure page
-            'http://http.badssl.com'
-        ]
-
-        self.identity_box = self.browser.navbar.locationbar.identity_box
-
-    def test_invalid_cert(self):
-        with self.marionette.using_context('content'):
-            # Go to a site that has an invalid (expired) cert
-            self.assertRaises(MarionetteException, self.marionette.navigate, self.urls[0])
-
-            # Wait for the DOM to receive events
-            time.sleep(1)
-
-            # Verify the text in Technical Content contains the page with invalid cert
-            text = self.marionette.find_element(By.ID, 'badCertTechnicalInfo')
-            self.assertIn(self.urls[0][8:], text.get_property('textContent'))
-
-            # Verify the "Go Back" and "Advanced" buttons appear
-            self.assertIsNotNone(self.marionette.find_element(By.ID, 'returnButton'))
-            self.assertIsNotNone(self.marionette.find_element(By.ID, 'advancedButton'))
-
-            # Verify the error code is correct
-            self.assertIn('SEC_ERROR_EXPIRED_CERTIFICATE', text.get_property('textContent'))
-
-    def test_secure_website(self):
-        with self.marionette.using_context('content'):
-            self.marionette.navigate(self.urls[1])
-
-        Wait(self.marionette).until(lambda _: (
-            self.identity_box.get_property('className') == 'verifiedDomain')
-        )
-
-    def test_insecure_website(self):
-        with self.marionette.using_context('content'):
-            self.marionette.navigate(self.urls[2])
-
-        Wait(self.marionette).until(lambda _: (
-            self.identity_box.get_property('className') == 'notSecure')
-        )
deleted file mode 100644
--- a/testing/firefox-ui/tests/functional/security/test_ssl_disabled_error_page.py
+++ /dev/null
@@ -1,67 +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 __future__ import absolute_import
-import time
-
-from firefox_puppeteer import PuppeteerMixin
-from marionette_driver import By, expected, Wait
-from marionette_driver.errors import MarionetteException
-from marionette_harness import MarionetteTestCase
-
-
-class TestSSLDisabledErrorPage(PuppeteerMixin, MarionetteTestCase):
-
-    def setUp(self):
-        super(TestSSLDisabledErrorPage, self).setUp()
-
-        self.url = 'https://tls-v1-0.badssl.com:1010'
-
-        self.puppeteer.utils.sanitize({"sessions": True})
-
-        # Disable SSL 3.0, TLS 1.0 and TLS 1.1 for secure connections
-        # by forcing the use of TLS 1.2
-        # see: http://kb.mozillazine.org/Security.tls.version.*#Possible_values_and_their_effects
-        self.marionette.set_pref('security.tls.version.min', 3)
-        self.marionette.set_pref('security.tls.version.max', 3)
-
-    def tearDown(self):
-        try:
-            self.marionette.clear_pref('security.tls.version.min')
-            self.marionette.clear_pref('security.tls.version.max')
-        finally:
-            super(TestSSLDisabledErrorPage, self).tearDown()
-
-    def test_ssl_disabled_error_page(self):
-        with self.marionette.using_context('content'):
-            # Open the test page
-            self.assertRaises(MarionetteException, self.marionette.navigate, self.url)
-
-            # Wait for the DOM to receive events
-            time.sleep(1)
-
-            # Verify "Secure Connection Failed" error page title
-            title = self.marionette.find_element(By.CLASS_NAME, 'title-text')
-            nss_failure2title = self.browser.localize_entity('nssFailure2.title')
-            self.assertEquals(title.get_property('textContent'), nss_failure2title)
-
-            # Verify the error message is correct
-            short_description = self.marionette.find_element(By.ID, 'errorShortDescText')
-            self.assertIn('SSL_ERROR_UNSUPPORTED_VERSION',
-                          short_description.get_property('textContent'))
-
-            # Verify that the "Restore" button appears and works
-            restore_button = self.marionette.find_element(By.ID, 'prefResetButton')
-            restore_button.click()
-            Wait(self.marionette).until(
-                expected.element_not_present(By.ID, "prefResetButton"),
-                message="Click on the restore button didn't trigger a page load"
-            )
-
-            # With the preferences reset, the page has to load correctly
-            el = Wait(self.marionette, timeout=self.marionette.timeout.page_load).until(
-                expected.element_present(By.TAG_NAME, 'h1'),
-                message="Expected target page has not been loaded"
-            )
-            self.assertIn('tls-v1-0', el.get_property('innerText'))
deleted file mode 100644
--- a/testing/firefox-ui/tests/functional/security/test_submit_unencrypted_info_warning.py
+++ /dev/null
@@ -1,68 +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 __future__ import absolute_import
-from firefox_puppeteer import PuppeteerMixin
-from marionette_driver import By, expected, Wait
-from marionette_driver.errors import NoAlertPresentException
-from marionette_driver.marionette import Alert
-from marionette_harness import MarionetteTestCase
-
-
-class TestSubmitUnencryptedInfoWarning(PuppeteerMixin, MarionetteTestCase):
-
-    def setUp(self):
-        super(TestSubmitUnencryptedInfoWarning, self).setUp()
-
-        self.url = 'https://mixed-form.badssl.com/'
-        self.test_string = 'mozilla'
-
-        # Disable rcwn to make cache behavior deterministic
-        self.marionette.set_pref('network.http.rcwn.enabled', False)
-        self.marionette.set_pref('security.warn_submit_insecure', True)
-
-    def tearDown(self):
-        try:
-            self.marionette.clear_pref('network.http.rcwn.enabled')
-            self.marionette.clear_pref('security.warn_submit_insecure')
-        finally:
-            super(TestSubmitUnencryptedInfoWarning, self).tearDown()
-
-    def test_submit_unencrypted_info_warning(self):
-        with self.marionette.using_context('content'):
-            self.marionette.navigate(self.url)
-
-            # Get the page's search box and submit button.
-            searchbox = self.marionette.find_element(By.ID, 'value')
-            button = self.marionette.find_element(By.CSS_SELECTOR, 'button')
-
-            # Use the page's search box to submit information.
-            searchbox.send_keys(self.test_string)
-            button.click()
-
-            # Get the expected warning text and replace its two instances of "##" with "\n\n".
-            message = self.browser.localize_property('formPostSecureToInsecureWarning.message')
-            message = message.replace('##', '\n\n')
-
-            # Wait for the warning, verify the expected text matches warning, accept the warning
-            warning = Alert(self.marionette)
-            try:
-                Wait(self.marionette,
-                     ignored_exceptions=NoAlertPresentException,
-                     timeout=self.marionette.timeout.page_load).until(
-                    lambda _: warning.text == message)
-            finally:
-                warning.accept()
-
-            # Wait for the search box to become stale, then wait for the page to be reloaded.
-            Wait(self.marionette).until(expected.element_stale(searchbox))
-
-            # TODO: Bug 1140470: use replacement for mozmill's waitforPageLoad
-            Wait(self.marionette, timeout=self.marionette.timeout.page_load).until(
-                lambda mn: mn.execute_script('return document.readyState == "DOMContentLoaded" ||'
-                                             '       document.readyState == "complete";')
-            )
-
-            self.assertEqual('http://http.badssl.com/resources/form-submitted.html',
-                             self.marionette.get_url())
deleted file mode 100644
--- a/testing/firefox-ui/tests/functional/security/test_unknown_issuer.py
+++ /dev/null
@@ -1,35 +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 __future__ import absolute_import
-import time
-
-from marionette_driver import By
-from marionette_driver.errors import MarionetteException
-from marionette_harness import MarionetteTestCase
-
-
-class TestUnknownIssuer(MarionetteTestCase):
-
-    def setUp(self):
-        super(TestUnknownIssuer, self).setUp()
-
-        self.url = 'https://untrusted-root.badssl.com/'
-
-    def test_unknown_issuer(self):
-        with self.marionette.using_context('content'):
-            # Go to a site that has a cert with an unknown issuer
-            self.assertRaises(MarionetteException, self.marionette.navigate, self.url)
-
-            # Wait for the DOM to receive events
-            time.sleep(1)
-
-            # Check for the correct error code
-            error = self.marionette.find_element(By.ID, 'errorCode')
-            self.assertEquals(error.get_property('textContent'),
-                              'SEC_ERROR_UNKNOWN_ISSUER')
-
-            # Verify the "Go Back" and "Advanced" buttons appear
-            self.assertIsNotNone(self.marionette.find_element(By.ID, 'returnButton'))
-            self.assertIsNotNone(self.marionette.find_element(By.ID, 'advancedButton'))
deleted file mode 100644
--- a/testing/firefox-ui/tests/functional/security/test_untrusted_connection_error_page.py
+++ /dev/null
@@ -1,45 +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 __future__ import absolute_import
-import time
-
-from firefox_puppeteer import PuppeteerMixin
-from marionette_driver import By, Wait
-from marionette_driver.errors import MarionetteException
-from marionette_harness import MarionetteTestCase
-
-
-class TestUntrustedConnectionErrorPage(PuppeteerMixin, MarionetteTestCase):
-
-    def setUp(self):
-        super(TestUntrustedConnectionErrorPage, self).setUp()
-
-        self.url = 'https://self-signed.badssl.com'
-
-        # Disable rcwn to make cache behavior deterministic
-        self.marionette.set_pref('network.http.rcwn.enabled', False)
-
-    def tearDown(self):
-        try:
-            self.marionette.clear_pref('network.http.rcwn.enabled')
-        finally:
-            super(TestUntrustedConnectionErrorPage, self).tearDown()
-
-    def test_untrusted_connection_error_page(self):
-        self.marionette.set_context('content')
-
-        # In some localized builds, the default page redirects
-        target_url = self.browser.get_final_url(self.browser.default_homepage)
-
-        self.assertRaises(MarionetteException, self.marionette.navigate, self.url)
-
-        # Wait for the DOM to receive events
-        time.sleep(1)
-
-        button = self.marionette.find_element(By.ID, "returnButton")
-        button.click()
-
-        Wait(self.marionette, timeout=self.marionette.timeout.page_load).until(
-            lambda mn: target_url == self.marionette.get_url())