~ preserve resolution result when clearing timeout

Author: Eric Prud'hommeaux

test/flood-test.js

@@ -73,7 +73,11 @@ describe('timeout-promise-queue', () => {
     function cb (done) {
       test.exec.then(exec => {
         if (test.ok) {
-          report(true)
+          if (typeof exec !== 'object' || exec.exitCode !== 0) {
+            report(false, 'resolved result "' + JSON.stringify(exec) + '" !== { exitCode: 0 }')
+          } else {
+            report(true)
+          }
         } else {
           report(false, 'unexpected success')
         }

timeout-promise-queue.js

@@ -38,11 +38,12 @@ function PromiseQueue (threshold) {
                 nextEntry()
                 reject(r)
               }, timeout)
-              myCancellation.on('clear', resolve)
+              // pfunc().then emits 'clear' which resolves with pfunc's result.
+              myCancellation.on('clear', result => resolve(result))
               return timer
             }),
             pfunc(clientCancellation).then(result => {
-              myCancellation.emit('clear');
+              myCancellation.emit('clear', result);
               clearTimeout(timer)
               return result
             })