Backed out changeset face8d3f9fb9 (bug 1384818) for frequently failing xpcshell's services/sync/tests/unit/test_errorhandler_2.js on Linux. r=backout
authorSebastian Hengst <archaeopteryx@coole-files.de>
Fri, 28 Jul 2017 10:48:07 +0200
changeset 420263 66c1061c0d08b3fff5bb0d4b47a268ab5b50f2be
parent 420262 8079b6c0ef641059e716d897f23fabeeeeecd396
child 420264 09a412e3cc3b1a1fd9a1325e161d36b91018ef24
push id7566
push usermtabara@mozilla.com
push dateWed, 02 Aug 2017 08:25:16 +0000
treeherdermozilla-beta@86913f512c3c [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbackout
bugs1384818
milestone56.0a1
backs outface8d3f9fb9045e40b1eaabfa2794d6f4bae5ea
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 face8d3f9fb9 (bug 1384818) for frequently failing xpcshell's services/sync/tests/unit/test_errorhandler_2.js on Linux. r=backout
services/sync/modules/policies.js
--- a/services/sync/modules/policies.js
+++ b/services/sync/modules/policies.js
@@ -594,17 +594,16 @@ ErrorHandler.prototype = {
   didReportProlongedError: false,
 
   init: function init() {
     Svc.Obs.add("weave:engine:sync:applied", this);
     Svc.Obs.add("weave:engine:sync:error", this);
     Svc.Obs.add("weave:service:login:error", this);
     Svc.Obs.add("weave:service:sync:error", this);
     Svc.Obs.add("weave:service:sync:finish", this);
-    Svc.Obs.add("weave:service:start-over:finish", this);
 
     this.initLogs();
   },
 
   initLogs: function initLogs() {
     this._log = Log.repository.getLogger("Sync.ErrorHandler");
     this._log.level = Log.Level[Svc.Prefs.get("log.logger.service.main")];
 
@@ -712,20 +711,16 @@ ErrorHandler.prototype = {
             break;
           }
         } else {
           this.resetFileLog();
         }
         this.dontIgnoreErrors = false;
         this.notifyOnNextTick("weave:ui:sync:finish");
         break;
-      case "weave:service:start-over:finish":
-        // ensure we capture any logs between the last sync and the reset completing.
-        this.resetFileLog();
-        break;
     }
   },
 
   notifyOnNextTick: function notifyOnNextTick(topic) {
     Utils.nextTick(function() {
       this._log.trace("Notifying " + topic +
                       ". Status.login is " + Status.login +
                       ". Status.sync is " + Status.sync);