Bug 1476934 - Disable the dump for the tippytop collection r=nanj
☠☠ backed out by 285ade739cd2 ☠ ☠
authorMathieu Leplatre <mathieu@mozilla.com>
Thu, 19 Jul 2018 16:27:25 +0200
changeset 427492 e56a701fc960ad035011da615ec13907d4f693a1
parent 427491 694fd83d0e639a602d552760e38f11b2b0cbc428
child 427493 22005ac8d9b286975b3d207862571a70b67c62b7
push id34306
push usercsabou@mozilla.com
push dateFri, 20 Jul 2018 21:41:18 +0000
treeherdermozilla-central@d6a5e8aea651 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersnanj
bugs1476934
milestone63.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1476934 - Disable the dump for the tippytop collection r=nanj MozReview-Commit-ID: FC1FMmTHRuO
browser/installer/allowed-dupes.mn
services/settings/dumps/main/.gitkeep
services/settings/dumps/main/moz.build
services/settings/dumps/main/tippytop.json
services/settings/test/unit/test_remote_settings_poll.js
--- a/browser/installer/allowed-dupes.mn
+++ b/browser/installer/allowed-dupes.mn
@@ -143,14 +143,11 @@ browser/chrome/browser/content/branding/
 browser/chrome/devtools/content/framework/dev-edition-promo/dev-edition-logo.png
 # Bug 1451016 - Nightly-only PaymentRequest & Form Autofill code sharing.
 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
 # 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
--- 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',
+    # '{collection-id}.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
@@ -1,16 +1,17 @@
 /* import-globals-from ../../../common/tests/unit/head_helpers.js */
 
 ChromeUtils.import("resource://gre/modules/AppConstants.jsm");
 ChromeUtils.import("resource://gre/modules/Services.jsm");
 ChromeUtils.import("resource://testing-common/httpd.js");
 
 const { UptakeTelemetry } = ChromeUtils.import("resource://services-common/uptake-telemetry.js", {});
-const { RemoteSettings } = ChromeUtils.import("resource://services-settings/remote-settings.js", {});
+const RemoteSettingsModule = ChromeUtils.import("resource://services-settings/remote-settings.js", {});
+const { RemoteSettings } = RemoteSettingsModule;
 const { Kinto } = ChromeUtils.import("resource://services-common/kinto-offline-client.js", {});
 
 const IS_ANDROID = AppConstants.platform == "android";
 
 const PREF_SETTINGS_SERVER = "services.settings.server";
 const PREF_SETTINGS_SERVER_BACKOFF = "services.settings.server.backoff";
 const PREF_LAST_UPDATE = "services.settings.last_update_seconds";
 const PREF_LAST_ETAG = "services.settings.last_etag";
@@ -496,26 +497,30 @@ 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: "with-dump"
   }]));
 
+  RemoteSettingsModule.hasLocalDump = async (bucket, collection) => {
+    return bucket == "main" && collection == "with-dump";
+  };
+
   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 `with-dump` 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, "with-dump");
 });
 add_task(clear_state);