fix(ci): allow retries for fetch test

Signed-off-by: Victor Adossi <[email protected]>

Author: vados-cosmonic

package-lock.json

@@ -1,20 +1,53 @@
+import { URL, fileURLToPath } from 'node:url';
+import { createServer } from 'node:net';
+
 import { strictEqual, ok } from 'node:assert';
 
-export const source = `
+const FETCH_URL = 'http://localhost';
+
+export const state = async () => {
+  const { getRandomPort } = await import(
+    fileURLToPath(new URL('../util.js', import.meta.url))
+  );
+  const port = await getRandomPort();
+  return { port };
+};
+
+export const source = (testState) => {
+  let port = testState?.port ? ':' + testState.port : '';
+  return `
   export async function run () {
-    const res = await fetch('https://httpbin.org/anything');
+    const res = await fetch('${FETCH_URL}${port}');
     const source = await res.json();
     console.log(source.url);
   }
   export function ready () {
     return true;
   }
 `;
+};
 
 export const enableFeatures = ['http'];
 
-export async function test(run) {
+export async function test(run, testState) {
+  // Get the randomly generated port
+  const port = testState.port;
+  if (!port) {
+    throw new Error('missing port on test state');
+  }
+
+  // Run a local server on some port
+  const server = createServer(async (req, res) => {
+    res.writeHead(200, { 'Content-Type': 'application/json; charset=utf-8' });
+    res.write(
+      JSON.stringify({
+        status: 'ok',
+      }),
+    );
+    res.end();
+  }).listen(port);
+
   const { stdout, stderr } = await run();
   strictEqual(stderr, '');
-  strictEqual(stdout.trim(), 'https://httpbin.org/anything');
+  strictEqual(stdout.trim(), FETCH_URL);
 }

test/builtins/fetch.js

@@ -11,6 +11,8 @@ const LOG_DEBUGGING = false;
 const enableAot = process.env.WEVAL_TEST == '1';
 const debugBuild = process.env.DEBUG_TEST == '1';
 
+const noOp = async () => {};
+
 function maybeLogging(disableFeatures) {
   if (!LOG_DEBUGGING) return disableFeatures;
   if (disableFeatures && disableFeatures.includes('stdio')) {
@@ -25,12 +27,23 @@ suite('Builtins', () => {
     const name = filename.slice(0, -3);
     test(name, async () => {
       const {
+        state,
         source,
         test: runTest,
         disableFeatures,
         enableFeatures,
       } = await import(`./builtins/${filename}`);
 
+      // If an args object was provided, generate the arguments to feed to both
+      // source generation (if necessary) and the test run itself
+      let stateFn = state ?? noOp;
+      const stateObj = await stateFn();
+
+      // If the source is a function then invoke it to generate the source string, possibly with arguments
+      if (typeof source === 'function') {
+        source(stateObj);
+      }
+
       const { component } = await componentize(
         source,
         `
@@ -46,7 +59,7 @@ suite('Builtins', () => {
           enableFeatures,
           disableFeatures: maybeLogging(disableFeatures),
           enableAot,
-        }
+        },
       );
 
       const { files } = await transpile(component, {
@@ -61,13 +74,13 @@ suite('Builtins', () => {
 
       await writeFile(
         new URL(`./output/${name}.component.wasm`, import.meta.url),
-        component
+        component,
       );
 
       for (const file of Object.keys(files)) {
         await writeFile(
           new URL(`./output/${name}/${file}`, import.meta.url),
-          files[file]
+          files[file],
         );
       }
 
@@ -76,11 +89,12 @@ suite('Builtins', () => {
         `
         import { run } from './${name}.js';
         run();
-      `
+      `,
       );
 
       try {
-        await runTest(async function run() {
+        // Build a run function to pass to the test
+        const runFn = async function run() {
           let stdout = '',
             stderr = '',
             timeout;
@@ -90,10 +104,10 @@ suite('Builtins', () => {
                 process.argv[0],
                 [
                   fileURLToPath(
-                    new URL(`./output/${name}/run.js`, import.meta.url)
+                    new URL(`./output/${name}/run.js`, import.meta.url),
                   ),
                 ],
-                { stdio: 'pipe' }
+                { stdio: 'pipe' },
               );
               cp.stdout.on('data', (chunk) => {
                 stdout += chunk;
@@ -103,16 +117,16 @@ suite('Builtins', () => {
               });
               cp.on('error', reject);
               cp.on('exit', (code) =>
-                code === 0 ? resolve() : reject(new Error(stderr || stdout))
+                code === 0 ? resolve() : reject(new Error(stderr || stdout)),
               );
               timeout = setTimeout(() => {
                 reject(
                   new Error(
                     'test timed out with output:\n' +
                       stdout +
                       '\n\nstderr:\n' +
-                      stderr
-                  )
+                      stderr,
+                  ),
                 );
               }, 10_000);
             });
@@ -123,7 +137,10 @@ suite('Builtins', () => {
           }
 
           return { stdout, stderr };
-        });
+        };
+
+        // Run the actual test
+        await runTest(runFn, stateObj);
       } catch (err) {
         if (err.stderr) console.error(err.stderr);
         throw err.err || err;
@@ -138,7 +155,7 @@ suite('Bindings', () => {
     test(name, async () => {
       const source = await readFile(
         new URL(`./cases/${name}/source.js`, import.meta.url),
-        'utf8'
+        'utf8',
       );
 
       let witWorld,
@@ -148,14 +165,14 @@ suite('Bindings', () => {
       try {
         witWorld = await readFile(
           new URL(`./cases/${name}/world.wit`, import.meta.url),
-          'utf8'
+          'utf8',
         );
       } catch (e) {
         if (e?.code == 'ENOENT') {
           try {
             isWasiTarget = true;
             witPath = fileURLToPath(
-              new URL(`./cases/${name}/wit`, import.meta.url)
+              new URL(`./cases/${name}/wit`, import.meta.url),
             );
             await readdir(witPath);
           } catch (e) {
@@ -229,14 +246,14 @@ suite('Bindings', () => {
 
         await writeFile(
           new URL(`./output/${name}.component.wasm`, import.meta.url),
-          component
+          component,
         );
 
         for (const file of Object.keys(files)) {
           let source = files[file];
           await writeFile(
             new URL(`./output/${name}/${file}`, import.meta.url),
-            source
+            source,
           );
         }
 
@@ -274,12 +291,12 @@ suite('WASI', () => {
         worldName: 'test1',
         enableAot,
         debugBuild,
-      }
+      },
     );
 
     await writeFile(
       new URL(`./output/wasi.component.wasm`, import.meta.url),
-      component
+      component,
     );
 
     const { files } = await transpile(component, { tracing: DEBUG_TRACING });
@@ -291,7 +308,7 @@ suite('WASI', () => {
     for (const file of Object.keys(files)) {
       await writeFile(
         new URL(`./output/wasi/${file}`, import.meta.url),
-        files[file]
+        files[file],
       );
     }
 

test/test.js

@@ -0,0 +1,13 @@
+import { createServer } from 'node:net';
+
+// Utility function for getting a random port
+export async function getRandomPort() {
+  return await new Promise((resolve) => {
+    const server = createServer();
+    server.listen(0, function () {
+      const port = this.address().port;
+      server.on('close', () => resolve(port));
+      server.close();
+    });
+  });
+}