[New] add .teardown() on t instances

.github/workflows/node-zero.yml

@@ -12,6 +12,7 @@ jobs:
       - uses: ljharb/actions/node/matrix@main
         id: set-matrix
         with:
+          versionsAsRoot: true
           preset: '0.x'
 
   stable:
@@ -20,7 +21,8 @@ jobs:
     runs-on: ubuntu-latest
 
     strategy:
-      matrix: ${{ fromJson(needs.matrix.outputs.stable) }}
+      matrix:
+        node-version: ${{ fromJson(needs.matrix.outputs.stable) }}
 
     steps:
       - uses: actions/checkout@v2
@@ -39,7 +41,10 @@ jobs:
     runs-on: ubuntu-latest
 
     strategy:
-      matrix: ${{ fromJson(needs.matrix.outputs.unstable) }}
+      matrix:
+        node-version: ${{ fromJson(needs.matrix.outputs.unstable) }}
+        exclude:
+          - node-version: '0.6'
 
     steps:
       - uses: actions/checkout@v2

lib/test.js

@@ -69,6 +69,7 @@ function Test(name_, opts_, cb_) {
     this._plan = undefined;
     this._cb = args.cb;
     this._progeny = [];
+    this._teardown = [];
     this._ok = true;
     var depthEnvVar = process.env.NODE_TAPE_OBJECT_PRINT_DEPTH;
     if (args.opts.objectPrintDepth) {
@@ -190,6 +191,14 @@ Test.prototype.end = function (err) {
     this._end();
 };
 
+Test.prototype.teardown = function (fn) {
+    if (typeof fn !== 'function') {
+        this.fail('teardown: ' + inspect(fn) + ' is not a function');
+    } else {
+        this._teardown.push(fn);
+    }
+};
+
 Test.prototype._end = function (err) {
     var self = this;
 
@@ -202,16 +211,48 @@ Test.prototype._end = function (err) {
         return;
     }
 
-    if (!this.ended) this.emit('end');
-    var pendingAsserts = this._pendingAsserts();
-    if (!this._planError && this._plan !== undefined && pendingAsserts) {
-        this._planError = true;
-        this.fail('plan != count', {
-            expected: this._plan,
-            actual: this.assertCount
-        });
+
+    function next(i) {
+        if (i === self._teardown.length) {
+            completeEnd();
+            return;
+        }
+        var fn = self._teardown[i];
+        var res;
+        try {
+            res = fn();
+        } catch (e) {
+            self.fail(e);
+        }
+        if (res && typeof res.then === 'function') {
+            res.then(function () {
+                next(++i);
+            }, function (_err) {
+                err = err || _err;
+            });
+        } else {
+            next(++i);
+        }
+    }
+
+    if (this._teardown.length > 0) {
+        next(0);
+    } else {
+        completeEnd();
+    }
+
+    function completeEnd() {
+        if (!self.ended) self.emit('end');
+        var pendingAsserts = self._pendingAsserts();
+        if (!self._planError && self._plan !== undefined && pendingAsserts) {
+            self._planError = true;
+            self.fail('plan != count', {
+                expected: self._plan,
+                actual: self.assertCount
+            });
+        }
+        self.ended = true;
     }
-    this.ended = true;
 };
 
 Test.prototype._exit = function () {

package.json

@@ -41,10 +41,12 @@
         "through": "^2.3.8"
     },
     "devDependencies": {
+        "array.prototype.flatmap": "^1.2.4",
         "aud": "^1.1.4",
         "concat-stream": "^1.6.2",
         "eclint": "^2.8.1",
         "ecstatic": "^4.1.4",
+        "es-value-fixtures": "^1.2.1",
         "eslint": "^7.20.0",
         "falafel": "^2.2.4",
         "js-yaml": "^3.14.0",

readme.markdown

@@ -170,6 +170,10 @@ If `cb` returns a Promise, it will be implicitly awaited. If that promise reject
 
 Generate a new test that will be skipped over.
 
+## test.teardown(cb)
+
+Register a callback to run after the individual test has completed. Multiple registered teardown callbacks will run in order. Useful for undoing side effects, closing network connections, etc.
+
 ## test.onFinish(fn)
 
 The onFinish hook will get invoked when ALL `tape` tests have finished right before `tape` is about to print the test summary.

test/common.js

@@ -69,6 +69,14 @@ module.exports.stripFullStack = function (output) {
         // Handle stack trace variation in Node v0.8
         /at(:?) Test\.(?:module\.exports|tap\.test\.err\.code)/g,
         'at$1 Test.<anonymous>'
+    ).replace(
+        // Handle stack trace variation in Node v0.8
+        /at(:?) (Test\.)?tap\.test\.test\.skip/g,
+        'at$1 $2<anonymous>'
+    ).replace(
+        // Handle stack trace variation in Node v0.8
+        /(\[\.\.\. stack stripped \.\.\.\]\n *at) <anonymous> \(([^)]+)\)/g,
+        '$1 $2'
     ).split('\n');
 };