Bug 1277669 - skip a couple of browserUITelemetry tests in dev edition. r=Gijs, a=testonly
authorMark Hammond <mhammond@skippinet.com.au>
Mon, 06 Jun 2016 17:14:05 +1000
changeset 341604 691f37458b8cd5e51c894bfcf04afe423459aee1
parent 341603 e63391c8a48b842772ea04c26b409a4b5ea3f31d
child 341605 e70892847544db94d801f80543fe8a7f6d836f90
push id1183
push userraliiev@mozilla.com
push dateMon, 05 Sep 2016 20:01:49 +0000
treeherdermozilla-release@3148731bed45 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersGijs, testonly
bugs1277669
milestone49.0a2
Bug 1277669 - skip a couple of browserUITelemetry tests in dev edition. r=Gijs, a=testonly CLOSED TREE
browser/modules/test/browser_BrowserUITelemetry_defaults.js
--- a/browser/modules/test/browser_BrowserUITelemetry_defaults.js
+++ b/browser/modules/test/browser_BrowserUITelemetry_defaults.js
@@ -5,22 +5,28 @@
 
 function test() {
   let s = {};
   Cu.import("resource:///modules/CustomizableUI.jsm", s);
   Cu.import("resource:///modules/BrowserUITelemetry.jsm", s);
 
   let { CustomizableUI, BrowserUITelemetry } = s;
 
-  Assert.ok(CustomizableUI.inDefaultState,
-            "No other test should have left CUI in a dirty state.");
+  // Bug 1278176 - DevEdition never has the UI in a default state by default.
+  if (!AppConstants.MOZ_DEV_EDITION) {
+    Assert.ok(CustomizableUI.inDefaultState,
+              "No other test should have left CUI in a dirty state.");
+  }
 
   let result = BrowserUITelemetry._getWindowMeasurements(window, 0);
 
-  Assert.deepEqual(result.defaultMoved, []);
+  // Bug 1278176 - DevEdition always reports the developer-button is moved.
+  if (!AppConstants.MOZ_DEV_EDITION) {
+    Assert.deepEqual(result.defaultMoved, []);
+  }
   Assert.deepEqual(result.nondefaultAdded, []);
   // This one is a bit weird - the "social-share-button" is dynamically added
   // to the toolbar as the feature is first used - but it's listed as being in
   // the toolbar by default so it doesn't end up in nondefaultAdded once it
   // is created. The end result is that it ends up in defaultRemoved before
   // the feature has been activated.
   // Bug 1273358 exists to fix this.
   Assert.deepEqual(result.defaultRemoved, ["social-share-button"]);