merge mozilla-central to autoland. r=merge a=merge
authorSebastian Hengst <archaeopteryx@coole-files.de>
Wed, 11 Oct 2017 14:25:10 +0200
changeset 679083 785914e661d7b61eebd529ad5761fbaff2b64aea
parent 679082 013a71e3da4e6d91c444b8af5e088547b718cf06 (current diff)
parent 678484 2c17b581bc180e9200840031527f92d0ea21c464 (diff)
child 679084 fb216e2b987078d7f79d2319072430292be3bc7e
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/puppeteer/manifest.ini
+++ b/testing/firefox-ui/tests/puppeteer/manifest.ini
@@ -2,16 +2,17 @@
 tags = local
 
 # API tests
 [test_appinfo.py]
 [test_l10n.py]
 [test_places.py]
 [test_security.py]
 tags = remote
+skip-if = os == "win" # Bug 1407437
 [test_software_update.py]
 [test_utils.py]
 
 # UI tests
 [test_about_window.py]
 [test_menubar.py]
 [test_notifications.py]
 [test_page_info_window.py]