Fixed errors that were created when a three year old pull request (mapbox#652) was rebased over multiple configuration changes.

Author: ronilan

lib/mock/http.js

@@ -7,8 +7,7 @@ const path = require('path');
 const nock = require('nock');
 const os = require('os');
 
-const log = require('npmlog');
-log.disableProgress(); // disable the display of a progress bar
+const log = require('../util/log.js');
 log.heading = 'node-pre-gyp'; // differentiate node-pre-gyp's logs from npm's
 
 function http_mock() {
@@ -17,6 +16,7 @@ function http_mock() {
   const basePath = `${os.tmpdir()}/mock`;
 
   nock(new RegExp('([a-z0-9]+[.])*s3[.]us-east-1[.]amazonaws[.]com'))
+    .persist()
     .get(() => true) //a function that always returns true is a catch all for nock
     .reply(
       (uri) => {

lib/mock/s3.js

@@ -5,8 +5,7 @@ module.exports = exports = s3_mock;
 const AWSMock = require('mock-aws-s3');
 const os = require('os');
 
-const log = require('npmlog');
-log.disableProgress(); // disable the display of a progress bar
+const log = require('../util/log.js');
 log.heading = 'node-pre-gyp'; // differentiate node-pre-gyp's logs from npm's
 
 function s3_mock() {