Bug 1332298 - Fix and re-enable test_dv_certificate.py, test_ev_certificate.py, test_toolbars.py. r=whimboo
authorDão Gottwald <dao@mozilla.com>
Fri, 20 Jan 2017 14:09:08 +0100
changeset 358371 3d6d5a48deaf7c146b093ae129a0cb75c4334c0c
parent 358370 d1f678120c11c025067e0cc5eca58d23e60e2bee
child 358372 c8b01174d7139ca83232a099eaf123cdfa0733b7
push id10621
push userjlund@mozilla.com
push dateMon, 23 Jan 2017 16:02:43 +0000
treeherdermozilla-aurora@dca7b42e6c67 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerswhimboo
bugs1332298
milestone53.0a1
Bug 1332298 - Fix and re-enable test_dv_certificate.py, test_ev_certificate.py, test_toolbars.py. r=whimboo
testing/firefox-ui/tests/functional/security/manifest.ini
testing/firefox-ui/tests/puppeteer/manifest.ini
testing/marionette/puppeteer/firefox/firefox_puppeteer/ui/browser/toolbars.py
--- a/testing/firefox-ui/tests/functional/security/manifest.ini
+++ b/testing/firefox-ui/tests/functional/security/manifest.ini
@@ -1,17 +1,15 @@
 [DEFAULT]
 tags = remote
 
 [test_dv_certificate.py]
-skip-if = true # Bug 1332298
 [test_enable_privilege.py]
 tags = local
 [test_ev_certificate.py]
-skip-if = true # Bug 1332298
 [test_mixed_content_page.py]
 [test_mixed_script_content_blocking.py]
 [test_no_certificate.py]
 tags = local
 [test_safe_browsing_initial_download.py]
 [test_safe_browsing_notification.py]
 [test_safe_browsing_warning_pages.py]
 [test_security_notification.py]
--- a/testing/firefox-ui/tests/puppeteer/manifest.ini
+++ b/testing/firefox-ui/tests/puppeteer/manifest.ini
@@ -13,13 +13,12 @@ tags = remote
 
 # UI tests
 [test_about_window.py]
 [test_menubar.py]
 [test_notifications.py]
 [test_page_info_window.py]
 [test_tabbar.py]
 [test_toolbars.py]
-skip-if = true # Bug 1332298
 tags = remote
 [test_update_wizard.py]
 tags = remote
 [test_windows.py]
--- a/testing/marionette/puppeteer/firefox/firefox_puppeteer/ui/browser/toolbars.py
+++ b/testing/marionette/puppeteer/firefox/firefox_puppeteer/ui/browser/toolbars.py
@@ -522,17 +522,17 @@ class IdentityPopupMainView(IdentityPopu
         return self.element.find_element(By.CLASS_NAME, 'identity-popup-expander')
 
     @property
     def host(self):
         """The DOM element which represents the identity-popup content host.
 
         :returns: Reference to the identity-popup content host.
         """
-        return self.element.find_element(By.CLASS_NAME, 'identity-popup-headline host')
+        return self.element.find_element(By.CLASS_NAME, 'identity-popup-host')
 
     @property
     def insecure_connection_label(self):
         """The DOM element which represents the identity popup insecure connection label.
 
         :returns: Reference to the identity-popup insecure connection label.
         """
         return self.element.find_element(By.CLASS_NAME, 'identity-popup-connection-not-secure')
@@ -583,17 +583,17 @@ class IdentityPopupSecurityView(Identity
                                          'button[when-mixedcontent=active-loaded]')
 
     @property
     def host(self):
         """The DOM element which represents the identity-popup content host.
 
         :returns: Reference to the identity-popup content host.
         """
-        return self.element.find_element(By.CLASS_NAME, 'identity-popup-headline host')
+        return self.element.find_element(By.CLASS_NAME, 'identity-popup-host')
 
     @property
     def insecure_connection_label(self):
         """The DOM element which represents the identity popup insecure connection label.
 
         :returns: Reference to the identity-popup insecure connection label.
         """
         return self.element.find_element(By.CLASS_NAME, 'identity-popup-connection-not-secure')