Backed out changeset e56a701fc960 (bug 1476934) for build bustages on moz-automation.mk. CLOSED TREE
authorCosmin Sabou <csabou@mozilla.com>
Fri, 20 Jul 2018 20:41:20 +0300
changeset 427497 285ade739cd21e156a9236c3e4bd242b5837604c
parent 427496 c552e6f6cc3ab580bfadf61fe78711beea0e6b6d
child 427498 c1e307c1e6ec83a053ceeac73fef451eaf58346e
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)
bugs1476934
milestone63.0a1
backs oute56a701fc960ad035011da615ec13907d4f693a1
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
Backed out changeset e56a701fc960 (bug 1476934) for build bustages on moz-automation.mk. CLOSED TREE
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,11 +143,14 @@ 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
deleted 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 += [
-    # '{collection-id}.json',
+    'tippytop.json',
 ]
 
 if CONFIG['MOZ_BUILD_APP'] == 'browser':
     DIST_SUBDIR = 'browser'
new file mode 100644
--- /dev/null
+++ b/services/settings/dumps/main/tippytop.json
@@ -0,0 +1,1 @@
+{"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,17 +1,16 @@
 /* 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 RemoteSettingsModule = ChromeUtils.import("resource://services-settings/remote-settings.js", {});
-const { RemoteSettings } = RemoteSettingsModule;
+const { RemoteSettings } = ChromeUtils.import("resource://services-settings/remote-settings.js", {});
 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";
@@ -497,30 +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: "with-dump"
+    collection: "tippytop"
   }]));
 
-  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 `with-dump` has a dump, and should cause a network error because the test
+  // The `tippytop` 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, "with-dump");
+  Assert.equal(error.details.collection, "tippytop");
 });
 add_task(clear_state);