fix(tests): mock outstanding error logs in test suite r=@vladikoff

Fixes #334 Mock outstanding error logs in test suite.
Also handles mozlog deprecation warning.

lib/logging/index.js

@@ -2,12 +2,9 @@
  * 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/. */
 
-const mozlog = require('mozlog');
-
 const config = require('../config').get('logging');
 
-mozlog.config(config);
-
+const mozlog = require('mozlog')(config);
 
 var root = mozlog(config.app);
 if (root.isEnabledFor('debug')) {

test/db/index.js

@@ -13,6 +13,7 @@ const db = require('../../lib/db');
 const config = require('../../lib/config');
 const auth = require('../../lib/auth');
 const Promise = require('bluebird');
+const mock = require('../lib/mocks');
 
 /*global describe,it,before*/
 
@@ -656,6 +657,10 @@ describe('db', function() {
       });
 
       it('should throw on empty email', function() {
+        mock.log('db', rec => {
+          return rec.levelname === 'ERROR'
+              && rec.args[0] === 'getDeveloper';
+        });
         return db.getDeveloper()
           .done(
           assert.fail,
@@ -678,6 +683,10 @@ describe('db', function() {
       });
 
       it('should not allow duplicates', function() {
+        mock.log('db', rec => {
+          return rec.levelname === 'ERROR'
+              && rec.args[0] === 'activateDeveloper';
+        });
         var email = 'email' + randomString(10) + '@mozilla.com';
 
         return db.activateDeveloper(email)
@@ -695,6 +704,10 @@ describe('db', function() {
       });
 
       it('should throw on empty email', function() {
+        mock.log('db', rec => {
+          return rec.levelname === 'ERROR'
+              && rec.args[0] === 'activateDeveloper';
+        });
         return db.activateDeveloper()
           .done(
             assert.fail,

test/lib/mocks.js

@@ -5,7 +5,8 @@
 const path = require('path');
 
 module.exports = {
-  require: requireDependencies
+  require: requireDependencies,
+  log: mockLog
 };
 
 // `mocks.require`
@@ -52,3 +53,18 @@ function requireDependency(dependency, modulePath, basePath) {
   return require(localPath);
 }
 
+function mockLog(logger, cb) {
+  var root = require('../../lib/logging')();
+  var log = require('../../lib/logging')(logger);
+  var filter = {
+    filter: function(record) {
+      if (cb(record)) {
+        log.removeFilter(filter);
+        log.setLevel(root.getEffectiveLevel());
+        return false;
+      }
+      return true;
+    }
+  };
+  log.addFilter(filter);
+}