From defeec89e6aae3986ca30e8d83721d32510bc423 Mon Sep 17 00:00:00 2001 From: Mathieu Leplatre Date: Thu, 19 Jul 2018 16:27:25 +0200 Subject: [PATCH] Bug 1476934 - Disable the dump for the tippytop collection r=nanj MozReview-Commit-ID: FC1FMmTHRuO --HG-- extra : rebase_source : 3925ae10418e946190bec579e37dcb2dfafe4d62 --- browser/installer/allowed-dupes.mn | 2 +- .../settings/dumps/main/{tippytop.json => example.json} | 0 services/settings/dumps/main/moz.build | 2 +- services/settings/test/unit/test_remote_settings_poll.js | 6 +++--- 4 files changed, 5 insertions(+), 5 deletions(-) rename services/settings/dumps/main/{tippytop.json => example.json} (100%) diff --git a/browser/installer/allowed-dupes.mn b/browser/installer/allowed-dupes.mn index 09fc28e6d86b..5685a30d9782 100644 --- a/browser/installer/allowed-dupes.mn +++ b/browser/installer/allowed-dupes.mn @@ -150,7 +150,7 @@ browser/features/formautofill@mozilla.org/chrome/content/autofillEditForms.js browser/chrome/browser/res/payments/formautofill/autofillEditForms.js # Bug 1451050 - Remote settings empty dumps (will be populated with data eventually) browser/defaults/settings/pinning/pins.json -browser/defaults/settings/main/tippytop.json +browser/defaults/settings/main/example.json # Bug 1463748 - Fork and pref-off the new error pages browser/chrome/browser/content/browser/aboutNetError-new.xhtml browser/chrome/browser/content/browser/aboutNetError.xhtml diff --git a/services/settings/dumps/main/tippytop.json b/services/settings/dumps/main/example.json similarity index 100% rename from services/settings/dumps/main/tippytop.json rename to services/settings/dumps/main/example.json diff --git a/services/settings/dumps/main/moz.build b/services/settings/dumps/main/moz.build index a603d08be500..c5b2a156d474 100644 --- a/services/settings/dumps/main/moz.build +++ b/services/settings/dumps/main/moz.build @@ -3,7 +3,7 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. FINAL_TARGET_FILES.defaults.settings.main += [ - 'tippytop.json', + 'example.json', ] if CONFIG['MOZ_BUILD_APP'] == 'browser': diff --git a/services/settings/test/unit/test_remote_settings_poll.js b/services/settings/test/unit/test_remote_settings_poll.js index cc4b9f06a4f9..4e31a4ef954f 100644 --- a/services/settings/test/unit/test_remote_settings_poll.js +++ b/services/settings/test/unit/test_remote_settings_poll.js @@ -501,7 +501,7 @@ add_task(async function test_syncs_clients_with_local_dump() { last_modified: 8000, host: "localhost", bucket: "main", - collection: "tippytop" + collection: "example" }])); let error; @@ -513,9 +513,9 @@ add_task(async function test_syncs_clients_with_local_dump() { // The `main/some-unknown` should be skipped because it has no dump. // The `blocklists/addons` should be skipped because it is not the main bucket. - // The `tippytop` has a dump, and should cause a network error because the test + // The `example` has a dump, and should cause a network error because the test // does not setup the server to receive the requests of `maybeSync()`. Assert.ok(/HTTP 404/.test(error.message), "server will return 404 on sync"); - Assert.equal(error.details.collection, "tippytop"); + Assert.equal(error.details.collection, "example"); }); add_task(clear_state);