Destroy request instead of abort

Author: mantoni

lib/request.js

@@ -196,7 +196,7 @@ module.exports = function fetch(options, data, callback) {
 
   if (timeout) {
     timer = setTimeout(() => {
-      req.abort();
+      req.destroy();
       const err = new Error('Request timeout');
       err.code = 'E_TIMEOUT';
       log.warn({ ms: Date.now() - ts_start, request });

test/integration-test.js

@@ -1,7 +1,7 @@
 /*eslint-env mocha*/
 'use strict';
 
-const { assert, refute, sinon } = require('@sinonjs/referee-sinon');
+const { assert, refute, match, sinon } = require('@sinonjs/referee-sinon');
 const http = require('http');
 const request = require('..');
 
@@ -16,8 +16,7 @@ describe('integration', () => {
   it('request timeout', (done) => {
     server = http.createServer((_req, _res) => {});
     server.listen(() => {
-
-      const on_abort = sinon.fake();
+      const onError = sinon.fake();
       const req = request({
         protocol: 'http:',
         hostname: 'localhost',
@@ -27,12 +26,11 @@ describe('integration', () => {
         refute.isNull(err);
         assert.equals(err.message, 'Request timeout');
         setTimeout(() => {
-          assert.calledOnce(on_abort);
+          assert.calledOnceWith(onError, match({ message: 'socket hang up' }));
           done();
         }, 10);
       });
-      req.on('abort', on_abort);
-
+      req.on('error', onError);
     });
   });
 
@@ -51,7 +49,6 @@ describe('integration', () => {
       res.end();
     });
     server.listen(() => {
-
       request({
         protocol: 'http:',
         hostname: 'localhost',
@@ -64,8 +61,6 @@ describe('integration', () => {
         assert.equals(json, { hello: 'redirect' });
         done();
       });
-
     });
   });
-
 });

test/request-test.js

@@ -29,7 +29,7 @@ describe('request', () => {
   beforeEach(() => {
     req = new EventEmitter();
     req.end = sinon.fake();
-    req.abort = sinon.fake();
+    req.destroy = sinon.fake();
     res = fakeResponse();
     sinon.replace(http, 'request', sinon.fake.returns(req));
     sinon.replace(https, 'request', sinon.fake.returns(req));
@@ -302,7 +302,7 @@ describe('request', () => {
       message: 'Request timeout',
       code: 'E_TIMEOUT'
     }));
-    assert.calledOnce(req.abort);
+    assert.calledOnce(req.destroy);
   });
 
   it('does not modify the original options', () => {