Merge branch '1.0' into 1.1

Author: oskarhane

test/internal/tls.test.js

@@ -26,7 +26,10 @@ var isLocalHost = require("../../lib/v1/internal/util").isLocalHost;
 describe('trust-signed-certificates', function() {
 
   var driver;
-
+  var log = console.log
+  beforeEach(function() {
+    console.log = function () {}; // To mute deprecation message in test output
+  })
   it('should reject unknown certificates', function(done) {
     // Assuming we only run this test on NodeJS
     if( !NodeChannel.available ) {
@@ -88,16 +91,13 @@ describe('trust-signed-certificates', function() {
     if( driver ) {
       driver.close();
     }
+    console.log = log;
   });
 });
 
 describe('trust-custom-ca-signed-certificates', function() {
 
   var driver;
-  var log = console.log
-  beforeEach(function() {
-    console.log = function () {}; // To mute deprecation message in test output
-  })
   it('should reject unknown certificates', function(done) {
     // Assuming we only run this test on NodeJS
     if( !NodeChannel.available ) {
@@ -141,7 +141,6 @@ describe('trust-custom-ca-signed-certificates', function() {
     if( driver ) {
       driver.close();
     }
-    console.log = log;
   });
 });