refactor(tests); allow more retries on weval tests only

Author: vados-cosmonic

test/bindings.js

@@ -11,13 +11,14 @@ import {
   WEVAL_TEST_ENABLED,
   DEBUG_TEST_ENABLED,
   maybeLogging,
+  buildDefaultTestOpts,
 } from './util.js';
 
 suite('Bindings', async () => {
   const bindingsCases = await readdir(new URL('./cases', import.meta.url));
 
   for (const name of bindingsCases) {
-    test(name, async () => {
+      test(name, buildDefaultTestOpts(), async () => {
       const source = await readFile(
         new URL(`./cases/${name}/source.js`, import.meta.url),
         'utf8',

test/builtins.js

@@ -12,14 +12,15 @@ import {
   WEVAL_TEST_ENABLED,
   DEBUG_TEST_ENABLED,
   maybeLogging,
+  buildDefaultTestOpts,
 } from './util.js';
 
 suite('Builtins', async () => {
   const builtins = await readdir(new URL('./builtins', import.meta.url));
 
   for (const filename of builtins) {
     const name = filename.slice(0, -3);
-    test(name, async () => {
+    test(name, buildDefaultTestOpts(), async () => {
       const {
         source,
         test: runTest,

test/util.js

@@ -7,9 +7,20 @@ export const WEVAL_TEST_ENABLED = isEnabledEnvVar(env.WEVAL_TEST);
 export const DEBUG_TEST_ENABLED = isEnabledEnvVar(env.DEBUG_TEST);
 
 function isEnabledEnvVar(v) {
-    return typeof v === 'string' && ['1', 'yes', 'true'].includes(v.toLowerCase());
+  return (
+    typeof v === 'string' && ['1', 'yes', 'true'].includes(v.toLowerCase())
+  );
 }
 
+// Enable retries for individual tests if weval is under test
+export function buildDefaultTestOpts() {
+  const opts = {};
+  // if weval is enabled, for more retries
+  if (WEVAL_TEST_ENABLED) {
+    opts.retry = 3;
+  }
+  return opts;
+}
 
 // Utility function for getting a random port
 export async function getRandomPort() {

test/wasi.js

@@ -13,13 +13,11 @@ import {
   DEBUG_TRACING_ENABLED,
   WEVAL_TEST_ENABLED,
   DEBUG_TEST_ENABLED,
+  buildDefaultTestOpts,
 } from './util.js';
 
-// Enable retries for individual tests if weval is under test
-const TEST_OPTS = WEVAL_TEST_ENABLED ? { retry: 3 } : undefined;
-
 suite('WASI', () => {
-  test('basic app (old API)', TEST_OPTS, async () => {
+  test('basic app (old API)', buildDefaultTestOpts(), async () => {
     const { instance } = await setupComponent({
       componentize: {
         src: `
@@ -61,7 +59,7 @@ suite('WASI', () => {
     assert.strictEqual(result.split(',').length, 3);
   });
 
-  test('basic app (OriginalSourceFile API)', TEST_OPTS, async () => {
+    test('basic app (OriginalSourceFile API)', buildDefaultTestOpts(), async () => {
     const { instance } = await setupComponent({
       componentize: {
         opts: {