merge mozilla-central to autoland. r=merge a=merge
authorSebastian Hengst <archaeopteryx@coole-files.de>
Wed, 11 Oct 2017 16:15:40 +0200
changeset 679095 063607e625874aac87a95e57e0846b44dc29ec77
parent 679094 0648d35fc2d89d4aeb1352fcfb41e51db1b4a434 (current diff)
parent 678523 f3e939a81ee1169f9501ad96eb43bbf4bf4a1bde (diff)
child 679096 49e69b3ad3bac665964c647cc39b59d9f56372a2
push id84141
push userbmo:schien@mozilla.com
push dateThu, 12 Oct 2017 11:13:04 +0000
reviewersmerge, merge
milestone58.0a1
merge mozilla-central to autoland. r=merge a=merge
--- a/testing/firefox-ui/tests/functional/security/manifest.ini
+++ b/testing/firefox-ui/tests/functional/security/manifest.ini
@@ -1,15 +1,16 @@
 [DEFAULT]
 tags = remote
 
 [test_dv_certificate.py]
 [test_enable_privilege.py]
 tags = local
 [test_ev_certificate.py]
+skip-if = true # Bug 1407437
 [test_mixed_content_page.py]
 [test_mixed_script_content_blocking.py]
 [test_no_certificate.py]
 tags = local
 [test_safe_browsing_initial_download.py]
 skip-if = debug || asan # the GAPI key isn't available in debug or asan builds
 [test_safe_browsing_notification.py]
 [test_safe_browsing_warning_pages.py]