track thrown error when timeout/throws happen during promise waiting

Author: isaacs

lib/test.js

@@ -346,7 +346,7 @@ class Test extends Base {
   timeout (options) {
     options = options || {}
     options.expired = options.expired || this.name
-    if (this.occupied)
+    if (this.occupied && this.occupied.timeout)
       this.occupied.timeout(options)
     else
       Base.prototype.timeout.call(this, options)
@@ -867,7 +867,10 @@ class Test extends Base {
     // threw while waiting for a promise to resolve.
     // probably it's not ever gonna.
     if (this.occupied && this.occupied instanceof Waiter)
-      this.occupied.abort(new Error('error thrown while awaiting Promise'))
+      this.occupied.abort(Object.assign(
+        new Error('error thrown while awaiting Promise'),
+        { thrown: er }
+      ))
 
     this.process()
   }

tap-snapshots/test-test.js-TAP.test.js

@@ -3203,6 +3203,12 @@ TAP version 13
         message: error thrown while awaiting Promise
         stack: |
           {STACK}
+        thrown:
+          !error
+          name: Error
+          message: poop
+          stack: |
+            {STACK}
       source: |2
             setTimeout(() => t.threw(new Error('poop')))
             return t.resolveMatch(() => new Promise(() => {}), 'never resolves')