chore: extend timeout for js (#204)

* extend timeout for js * handle shutdown error * js: shutdown node in blob tests * js: force exit ndoe * improve shutdown logic --------- Co-authored-by: “ramfox” <“[email protected]”> Co-authored-by: dignifiedquire <[email protected]>
n0-computer · Nov 5, 2024 · bed7940 · bed7940
1 parent 735a03d
commit bed7940
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 6 deletions.
diff --git a/iroh-js/__test__/_force-exit.mjs b/iroh-js/__test__/_force-exit.mjs
@@ -0,0 +1,6 @@
+import process from 'node:process';
+import { registerCompletionHandler } from 'ava';
+
+registerCompletionHandler(() => {
+  process.exit();
+});
diff --git a/iroh-js/__test__/blob.spec.mjs b/iroh-js/__test__/blob.spec.mjs
@@ -37,6 +37,8 @@ test('add blob from path', async (t) => {
   t.is(allDone.format, 'Raw')
   t.truthy(allDone.tag)
   t.truthy(allDone.hash)
+
+  await node.node.shutdown(false)
 })
 
 test('hash basics', (t) => {
@@ -101,6 +103,8 @@ test('collections', async (t) => {
   t.is(collectionList.length, 1)
   t.is(collectionList[0].hash, res.hash)
   t.is(collectionList[0].totalBlobsCount, BigInt(numFiles + 1))
+
+  await node.node.shutdown(false)
 })
 
 test('share', async (t) => {
@@ -114,6 +118,8 @@ test('share', async (t) => {
   t.is(ticket.format, res.format)
   t.is(ticket.hash, res.hash)
   t.deepEqual(ticket.nodeAddr, nodeAddr)
+
+  await node.node.shutdown(false)
 })
 
 test('provide events', async (t) => {
@@ -167,4 +173,7 @@ test('provide events', async (t) => {
   await promise1
 
   t.is(events.length, 4)
+
+  await node1.node.shutdown(false)
+  await node2.node.shutdown(false)
 })
diff --git a/iroh-js/__test__/node.spec.mjs b/iroh-js/__test__/node.spec.mjs
@@ -61,11 +61,13 @@ test('custom protocol', async (t) => {
         t.is(bytes.toString(), 'yo')
         await bi.send.writeAll(Buffer.from('hello'))
         await bi.send.finish()
-        await bi.send.stopped()
+        await conn.closed()
       },
       shutdown: (err) => {
         if (err != null) {
-          throw err
+          if (!err.message.contains("closed by peer")) {
+            throw err
+          }
         }
         console.log('shutting down')
       }
@@ -78,8 +80,7 @@ test('custom protocol', async (t) => {
   const nodeAddr = await node1.net.nodeAddr()
 
   const node2 = await Iroh.memory({ protocols })
-  const status = await node2.node.status()
-  console.log(`status ${status.version}`)
+
   const endpoint = node2.node.endpoint()
   console.log(`connecting to ${nodeAddr.nodeId}`)
 
@@ -91,7 +92,6 @@ test('custom protocol', async (t) => {
 
   await bi.send.writeAll(Buffer.from('yo'))
   await bi.send.finish()
-  await bi.send.stopped()
 
   let out = Buffer.alloc(5)
   await bi.recv.readExact(out)

diff --git a/iroh-js/package.json b/iroh-js/package.json
@@ -46,7 +46,10 @@
     "ava": "^6.0.1"
   },
   "ava": {
-    "timeout": "3m"
+    "timeout": "5m",
+    "require": [
+      "./__test__/_force-exit.mjs"
+    ]
   },
   "scripts": {
     "artifacts": "napi artifacts",