Merge branch '1.0' into 1.1

Author: oskarhane

test/internal/tls.test.js

@@ -94,7 +94,10 @@ describe('trust-signed-certificates', function() {
 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 ) {
@@ -138,14 +141,15 @@ describe('trust-custom-ca-signed-certificates', function() {
     if( driver ) {
       driver.close();
     }
+    console.log = log;
   });
 });
 
 describe('trust-system-ca-signed-certificates', function() {
 
   var driver;
 
-  fit('should reject unknown certificates', function(done) {
+  it('should reject unknown certificates', function(done) {
     // Assuming we only run this test on NodeJS
     if( !NodeChannel.available ) {
       done();
@@ -327,7 +331,7 @@ describe('trust-on-first-use', function() {
       done();
     }, 1000);
   });
-  
+
   it('should should give helpful error if database cert does not match stored certificate', function(done) {
     // Assuming we only run this test on NodeJS with TOFU support
     if( !hasFeature("trust_on_first_use") ) {