Bug 1476934 - Disable the dump for the tippytop collection r=nanj
MozReview-Commit-ID: FC1FMmTHRuO
--- a/browser/installer/allowed-dupes.mn
+++ b/browser/installer/allowed-dupes.mn
@@ -145,12 +145,12 @@ browser/chrome/devtools/content/framewor
browser/features/formautofill@mozilla.org/chrome/content/editAddress.xhtml
browser/chrome/browser/res/payments/formautofill/editAddress.xhtml
browser/features/formautofill@mozilla.org/chrome/content/editCreditCard.xhtml
browser/chrome/browser/res/payments/formautofill/editCreditCard.xhtml
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
new file mode 100644
--- /dev/null
+++ b/services/settings/dumps/main/example.json
@@ -0,0 +1,1 @@
+{"data":[]}
\ No newline at end of file
--- a/services/settings/dumps/main/moz.build
+++ b/services/settings/dumps/main/moz.build
@@ -1,10 +1,10 @@
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# 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':
DIST_SUBDIR = 'browser'
deleted file mode 100644
--- a/services/settings/dumps/main/tippytop.json
+++ /dev/null
@@ -1,1 +0,0 @@
-{"data":[]}
\ No newline at end of file
--- a/services/settings/test/unit/test_remote_settings_poll.js
+++ b/services/settings/test/unit/test_remote_settings_poll.js
@@ -496,26 +496,26 @@ add_task(async function test_syncs_clien
host: "localhost",
bucket: "blocklists",
collection: "addons"
}, {
id: "9a594c1a-601f-11e8-9c8a-33b2239d9113",
last_modified: 8000,
host: "localhost",
bucket: "main",
- collection: "tippytop"
+ collection: "example"
}]));
let error;
try {
await RemoteSettings.pollChanges();
} catch (e) {
error = e;
}
// 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);