Backed out changeset 005f4ce1bf67 (bug 1304004) because of developers request from whimboo

testing/firefox-ui/tests/functional/security/manifest.ini

@@ -2,11 +2,15 @@
 tags = remote
 
 [test_dv_certificate.py]
+skip-if = true # 1304004
 [test_enable_privilege.py]
 tags = local
 [test_ev_certificate.py]
+skip-if = true # 1304004
 [test_mixed_content_page.py]
+skip-if = true # 1304004
 [test_mixed_script_content_blocking.py]
+skip-if = true # 1304004
 [test_no_certificate.py]
 tags = local
 [test_safe_browsing_initial_download.py]

testing/firefox-ui/tests/functional/security/test_dv_certificate.py

@@ -29,10 +29,9 @@ class TestDVCertificate(FirefoxTestCase):
         with self.marionette.using_context('content'):
             self.marionette.navigate(self.url)
 
-        # The correct lock icon should be shown
-        icon = self.locationbar.connection_icon
-        self.assertEqual('url("chrome://browser/skin/connection-secure.svg")',
-                         icon.value_of_css_property('list-style-image'))
+        # The lock icon should be shown
+        self.assertIn('identity-secure',
+                      self.locationbar.connection_icon.value_of_css_property('list-style-image'))
 
         self.assertEqual(self.locationbar.identity_box.get_attribute('className'),
                          'verifiedDomain')

testing/firefox-ui/tests/functional/security/test_ev_certificate.py

@@ -29,10 +29,9 @@ class TestEVCertificate(FirefoxTestCase):
         with self.marionette.using_context('content'):
             self.marionette.navigate(self.url)
 
-        # The correct lock icon should be shown
-        icon = self.locationbar.connection_icon
-        self.assertEqual('url("chrome://browser/skin/connection-secure.svg")',
-                         icon.value_of_css_property('list-style-image'))
+        # The lock icon should be shown
+        self.assertIn('identity-secure',
+                      self.locationbar.connection_icon.value_of_css_property('list-style-image'))
 
         # Check the identity box
         self.assertEqual(self.locationbar.identity_box.get_attribute('className'),

testing/firefox-ui/tests/functional/security/test_mixed_content_page.py

@@ -24,13 +24,8 @@ class TestMixedContentPage(FirefoxTestCase):
         with self.marionette.using_context('content'):
             self.marionette.navigate(self.url)
 
-        # The correct lock icon should be shown
-        icon = self.locationbar.connection_icon
-        self.assertEqual('url("chrome://browser/skin/connection-mixed-passive-loaded.svg#icon")',
-                         icon.value_of_css_property('list-style-image'))
-
-        self.assertEqual(self.locationbar.identity_box.get_attribute('className'),
-                         'unknownIdentity mixedDisplayContent')
+        self.assertIn('identity-mixed-passive-loaded',
+                      self.locationbar.connection_icon.value_of_css_property('list-style-image'))
 
         # Open the identity popup
         self.locationbar.open_identity_popup()

testing/firefox-ui/tests/functional/security/test_mixed_script_content_blocking.py

@@ -32,29 +32,25 @@ class TestMixedScriptContentBlocking(FirefoxTestCase):
 
     def _expect_protection_status(self, enabled):
         if enabled:
-            color, icon_filename, identity, state = (
+            color, icon_filename, state = (
                 'rgb(0, 136, 0)',
-                'url("chrome://browser/skin/connection-secure.svg")',
-                'verifiedDomain mixedActiveBlocked',
+                'identity-secure',
                 'blocked'
             )
         else:
-            color, icon_filename, identity, state = (
+            color, icon_filename, state = (
                 'rgb(255, 0, 0)',
-                'url("chrome://browser/skin/connection-mixed-active-loaded.svg#icon")',
-                'unknownIdentity mixedActiveContent',
+                'identity-mixed-active-loaded',
                 'unblocked'
             )
 
         # First call to Wait() needs a longer timeout due to the reload of the web page.
         connection_icon = self.locationbar.connection_icon
         Wait(self.marionette, timeout=self.browser.timeout_page_load).until(
-            lambda _: connection_icon.value_of_css_property('list-style-image') == icon_filename,
-            message='Connection icon "{}" is not set'.format(icon_filename)
+            lambda _: icon_filename in connection_icon.value_of_css_property('list-style-image'),
+            message="The correct icon is displayed"
         )
 
-        self.assertEqual(self.locationbar.identity_box.get_attribute('className'), identity)
-
         with self.marionette.using_context('content'):
             for identifier, description in self.test_elements:
                 el = self.marionette.find_element(By.ID, identifier)