test_runner: simplify code and make it more consistent

lib/internal/test_runner/test.js

@@ -13,7 +13,6 @@ const {
   MathMax,
   Number,
   NumberPrototypeToFixed,
-  ObjectDefineProperty,
   ObjectSeal,
   Promise,
   PromisePrototypeThen,
@@ -55,6 +54,7 @@ const {
 const {
   kEmptyObject,
   once: runOnce,
+  setOwnProperty,
 } = require('internal/util');
 const { isPromise } = require('internal/util/types');
 const {
@@ -133,33 +133,22 @@ function stopTest(timeout, signal) {
   if (timeout === kDefaultTimeout) {
     disposeFunction = abortListener[SymbolDispose];
   } else {
-    timer = setTimeout(() => deferred.resolve(), timeout);
+    timer = setTimeout(deferred.resolve, timeout);
     timer.unref();
-
-    ObjectDefineProperty(deferred, 'promise', {
-      __proto__: null,
-      configurable: true,
-      writable: true,
-      value: PromisePrototypeThen(deferred.promise, () => {
-        throw new ERR_TEST_FAILURE(
-          `test timed out after ${timeout}ms`,
-          kTestTimeoutFailure,
-        );
-      }),
-    });
+    setOwnProperty(deferred, 'promise', PromisePrototypeThen(deferred.promise, () => {
+      throw new ERR_TEST_FAILURE(
+        `test timed out after ${timeout}ms`,
+        kTestTimeoutFailure,
+      );
+    }));
 
     disposeFunction = () => {
       abortListener[SymbolDispose]();
       timer[SymbolDispose]();
     };
   }
 
-  ObjectDefineProperty(deferred.promise, SymbolDispose, {
-    __proto__: null,
-    configurable: true,
-    writable: true,
-    value: disposeFunction,
-  });
+  setOwnProperty(deferred.promise, SymbolDispose, disposeFunction);
   return deferred.promise;
 }
 
@@ -994,7 +983,7 @@ class Test extends AsyncResource {
     if (this.root.harness.buildPromise || !this.parent.hasConcurrency()) {
       const deferred = PromiseWithResolvers();
 
-      deferred.test = this;
+      setOwnProperty(deferred, 'test', this);
       this.parent.addPendingSubtest(deferred);
       return deferred.promise;
     }