Import Tycho weave client

1 files changed, 14 insertions, 28 deletions

diff --git a/services/sync/tests/unit/xpcshell.ini b/services/sync/tests/unit/xpcshell.ini
index 4c0f0e7b7..dc33c0eb2 100644
--- a/services/sync/tests/unit/xpcshell.ini
+++ b/services/sync/tests/unit/xpcshell.ini
@@ -1,7 +1,8 @@
 [DEFAULT]
-head = head_appinfo.js ../../../common/tests/unit/head_helpers.js head_helpers.js head_http_server.js head_errorhandler_common.js
+head = head_appinfo.js ../../../common/tests/unit/head_helpers.js head_helpers.js head_http_server.js
 tail =
 firefox-appdir = browser
+skip-if = toolkit == 'gonk'
 support-files =
   addon1-search.xml
   bootstrap1-search.xml
@@ -10,10 +11,6 @@ support-files =
   missing-xpi-search.xml
   places_v10_from_v11.sqlite
   rewrite-search.xml
-  sync_ping_schema.json
-  systemaddon-search.xml
-  !/services/common/tests/unit/head_helpers.js
-  !/toolkit/components/webextensions/test/xpcshell/head_sync.js
 
 # The manifest is roughly ordered from low-level to high-level. When making
 # systemic sweeping changes, this makes it easier to identify errors closer to
@@ -39,7 +36,6 @@ support-files =
 # We have a number of other libraries that are pretty much standalone.
 [test_addon_utils.js]
 run-sequentially = Restarts server, can't change pref.
-tags = addons
 [test_httpd_sync_server.js]
 [test_jpakeclient.js]
 # Bug 618233: this test produces random failures on Windows 7.
@@ -56,7 +52,6 @@ skip-if = os == "win" || os == "android"
 # Generic Sync types.
 [test_browserid_identity.js]
 [test_collection_inc_get.js]
-[test_collection_getBatched.js]
 [test_collections_recovery.js]
 [test_identity_manager.js]
 [test_keys.js]
@@ -97,7 +92,6 @@ skip-if = os == "mac" || os == "linux"
 [test_service_sync_remoteSetup.js]
 # Bug 676978: test hangs on Android (see also testing/xpcshell/xpcshell.ini)
 skip-if = os == "android"
-[test_service_sync_specified.js]
 [test_service_sync_updateEnabledEngines.js]
 # Bug 676978: test hangs on Android (see also testing/xpcshell/xpcshell.ini)
 skip-if = os == "android"
@@ -109,8 +103,7 @@ skip-if = os == "mac" || os == "linux"
 
 [test_corrupt_keys.js]
 [test_declined.js]
-[test_errorhandler_1.js]
-[test_errorhandler_2.js]
+[test_errorhandler.js]
 [test_errorhandler_filelog.js]
 # Bug 676978: test hangs on Android (see also testing/xpcshell/xpcshell.ini)
 skip-if = os == "android"
@@ -121,6 +114,7 @@ skip-if = os == "android"
 [test_hmac_error.js]
 [test_interval_triggers.js]
 [test_node_reassignment.js]
+[test_notifications.js]
 [test_score_triggers.js]
 [test_sendcredentials_controller.js]
 [test_status.js]
@@ -136,18 +130,12 @@ skip-if = os == "android"
 # Finally, we test each engine.
 [test_addons_engine.js]
 run-sequentially = Hardcoded port in static files.
-tags = addons
 [test_addons_reconciler.js]
-tags = addons
 [test_addons_store.js]
 run-sequentially = Hardcoded port in static files.
-tags = addons
 [test_addons_tracker.js]
-tags = addons
 [test_bookmark_batch_fail.js]
-[test_bookmark_duping.js]
 [test_bookmark_engine.js]
-[test_bookmark_invalid.js]
 [test_bookmark_legacy_microsummaries_support.js]
 [test_bookmark_livemarks.js]
 [test_bookmark_order.js]
@@ -158,13 +146,8 @@ tags = addons
 # Too many intermittent "ASSERTION: thread pool wasn't shutdown: '!mPool'" (bug 804479)
 skip-if = debug
 [test_bookmark_tracker.js]
-requesttimeoutfactor = 4
-[test_bookmark_validator.js]
 [test_clients_engine.js]
 [test_clients_escape.js]
-[test_extension_storage_crypto.js]
-[test_extension_storage_engine.js]
-[test_extension_storage_tracker.js]
 [test_forms_store.js]
 [test_forms_tracker.js]
 # Too many intermittent "ASSERTION: thread pool wasn't shutdown: '!mPool'" (bug 804479)
@@ -176,21 +159,24 @@ skip-if = debug
 skip-if = debug
 [test_places_guid_downgrade.js]
 [test_password_store.js]
-[test_password_validator.js]
 [test_password_tracker.js]
 # Too many intermittent "ASSERTION: thread pool wasn't shutdown: '!mPool'" (bug 804479)
 skip-if = debug
 [test_prefs_store.js]
-support-files = prefs_test_prefs_store.js
 [test_prefs_tracker.js]
 [test_tab_engine.js]
 [test_tab_store.js]
 [test_tab_tracker.js]
 
-[test_warn_on_truncated_response.js]
-[test_postqueue.js]
+[test_healthreport.js]
+skip-if = ! healthreport
+
+[test_healthreport_migration.js]
+skip-if = ! healthreport
 
-# Synced tabs.
-[test_syncedtabs.js]
+[test_warn_on_truncated_response.js]
 
-[test_telemetry.js]
+# FxA migration
+[test_block_sync.js]
+[test_fxa_migration.js]
+[test_fxa_migration_sentinel.js]