tests: abort AWS query when agent shuts down

lib/aws-info.js

@@ -58,18 +58,30 @@ module.exports._awsQuery = function awsQuery(key, agent, callback) {
       } else {
         data = data.toString('utf8')
       }
+
+      agent.removeListener('errored', abortRequest)
+      agent.removeListener('stopped', abortRequest)
       callback(data)
     }
   })
   req.setTimeout(1000, function awsTimeout() {
-    logger.debug('Request for attribute ' + key + ' timed out')
+    logger.debug('Request for attribute %s timed out', key)
     callback(null)
   })
   req.on('error', function awsError(err) {
-    logger.debug('Message for attribute ' + key + ': %s'
-      , err.message)
+    logger.debug('Message for attribute %s: %s', key, err.message)
     callback(null)
   })
+
+  agent.once('errored', abortRequest)
+  agent.once('stopped', abortRequest)
+
+  function abortRequest() {
+    logger.debug('Abborting request for attribute %s', key)
+    req.abort()
+    agent.removeListener('errored', abortRequest)
+    agent.removeListener('stopped', abortRequest)
+  }
 }
 
 function checkResponseString(str) {

lib/util/logger.js

@@ -213,4 +213,3 @@ function getPropertiesToLog(extra) {
   }
   return obj
 }
-

test/integration/pricing/system-info.tap.js

@@ -3,6 +3,7 @@
 var nock = require('nock')
 var assert = require('chai').assert
 var fetchSystemInfo = require('../../../lib/system-info')
+var EventEmitter = require('events').EventEmitter
 
 var awsHost = "http://169.254.169.254"
 
@@ -17,12 +18,12 @@ for (var awsPath in awsResponses) {
   awsRedirect.get('/2008-02-01/meta-data/' + awsPath).reply(200, awsResponses[awsPath])
 }
 
-var fakeAgent = {
-  config: {
-    utilization: {
-      detect_aws: true,
-      detect_docker: false
-    }
+
+var fakeAgent = new EventEmitter()
+fakeAgent.config = {
+  utilization: {
+    detect_aws: true,
+    detect_docker: false
   }
 }