mozilla-central: changeset 253570:0de836e73be4461686377d2c16015a8235454c28

author	Matthew Noorenberghe <mozilla@noorenberghe.ca>
	Sat, 18 Jul 2015 18:39:36 -0700
changeset 253570	0de836e73be4461686377d2c16015a8235454c28
parent 253569	3e0ef2cb3dc54225ab5daf2a63359886638b54ce
child 253571	2db081ae318560fd9c8894acc6dc501fe84db6d0
push id	29070
push user	ttaubert@mozilla.com
push date	Mon, 20 Jul 2015 07:15:19 +0000
treeherder	mozilla-central@202e9233d130 [default view] [failures only]
perfherder	[talos] [build metrics] [platform microbench] (compared to previous push)
bugs	1177162
milestone	42.0a1
first release with	nightly linux32 5df788c56ae7 / 42.0a1 / 20150720030213 / files nightly linux64 5df788c56ae7 / 42.0a1 / 20150720030213 / files nightly mac 5df788c56ae7 / 42.0a1 / 20150720030213 / files nightly win32 5df788c56ae7 / 42.0a1 / 20150720030213 / files nightly win64 5df788c56ae7 / 42.0a1 / 20150720030213 / files
last release without	nightly linux32 d317a93e5161 / 42.0a1 / 20150718030211 / files nightly linux64 d317a93e5161 / 42.0a1 / 20150718030211 / files nightly mac d317a93e5161 / 42.0a1 / 20150718030211 / files nightly win32 d317a93e5161 / 42.0a1 / 20150718030211 / files nightly win64 d317a93e5161 / 42.0a1 / 20150718030211 / files

--- a/browser/components/uitour/test/browser.ini
+++ b/browser/components/uitour/test/browser.ini
@@ -8,16 +8,17 @@ support-files =
 [browser_backgroundTab.js]
 skip-if = e10s # Bug 941428 - UITour.jsm not e10s friendly
 [browser_no_tabs.js]
 [browser_openPreferences.js]
 skip-if = e10s # Bug 1073247 - UITour tests not e10s friendly
 [browser_openSearchPanel.js]
 skip-if = true # Bug 1113038 - Intermittent "Popup was opened"
 [browser_trackingProtection.js]
+skip-if = os == "linux" # Intermittent NS_ERROR_NOT_AVAILABLE [nsIUrlClassifierDBService.beginUpdate]
 tag = trackingprotection
 [browser_showMenu_controlCenter.js]
 skip-if = e10s # Bug 1073247 - UITour tests not e10s friendly
 tag = trackingprotection
 [browser_UITour.js]
 skip-if = os == "linux" || e10s # Intermittent failures, bug 951965
 [browser_UITour2.js]
 skip-if = e10s # Bug 1073247 - UITour.jsm not e10s friendly