Bug 604565 - Disable intermittently failing xpcshell tests on OSX debug builds. r=mconnor a=orange

--HG--
rename : services/sync/tests/unit/head_appinfo.js => services/sync/tests/unit/head_appinfo.js.in

services/sync/tests/Makefile.in

@@ -47,3 +47,6 @@ MODULE = test_services_sync
 XPCSHELL_TESTS = unit
 
 include $(topsrcdir)/config/rules.mk
+
+libs:: unit/head_appinfo.js.in
+	$(PYTHON) $(topsrcdir)/config/Preprocessor.py $(DEFINES) $(ACDEFINES) $^ > $(DEPTH)/_tests/xpcshell/$(relativesrcdir)/unit/head_appinfo.js

services/sync/tests/unit/head_appinfo.js.in

@@ -62,3 +62,12 @@ registrar.registerFactory(Components.ID("{fbfae60b-64a4-44ef-a911-08ceb70b9f31}"
 // Provide resource://services-sync if it isn't already available
 let weaveService = Cc["@mozilla.org/weave/service;1"].getService();
 weaveService.wrappedJSObject.addResourceAlias();
+
+
+// Some tests hang on OSX debug builds. See bug 604565.
+let DISABLE_TESTS_BUG_604565 = false;
+#ifdef XP_MACOSX
+#ifdef MOZ_DEBUG_SYMBOLS
+DISABLE_TESTS_BUG_604565 = true;
+#endif
+#endif

services/sync/tests/unit/test_service_sync_checkServerError.js

@@ -132,6 +132,9 @@ function test_overQuota() {
 }
 
 function run_test() {
+  if (DISABLE_TESTS_BUG_604565)
+    return;
+
   test_backoff500();
   test_backoff503();
   test_overQuota();

services/sync/tests/unit/test_service_sync_updateEnabledEngines.js

@@ -342,6 +342,9 @@ function test_dependentEnginesDisabledLocally() {
 }
 
 function run_test() {
+  if (DISABLE_TESTS_BUG_604565)
+    return;
+
   test_newAccount();
   test_enabledLocally();
   test_disabledLocally();

services/sync/tests/unit/test_syncengine_sync.js

@@ -1150,6 +1150,9 @@ function test_canDecrypt_true() {
 
 
 function run_test() {
+  if (DISABLE_TESTS_BUG_604565)
+    return;
+
   test_syncStartup_emptyOrOutdatedGlobalsResetsSync();
   test_syncStartup_metaGet404();
   test_syncStartup_failedMetaGet();