From: Chris Duncan Date: Tue, 23 Sep 2025 18:47:37 +0000 (-0700) Subject: Fix expected failures in tests with timeouts. X-Git-Tag: v0.10.5~12^2~2 X-Git-Url: https://git.codecow.com/?a=commitdiff_plain;h=89fd3b01e9069b2064dfc1c30c669b385e69262d;p=libnemo.git Fix expected failures in tests with timeouts. --- diff --git a/test/test.ledger.mjs b/test/test.ledger.mjs index 34c52ed..c1a2759 100644 --- a/test/test.ledger.mjs +++ b/test/test.ledger.mjs @@ -56,13 +56,17 @@ await Promise.all([ assert.equal(wallet.isLocked, true) assert.equal(Ledger.status, 'BUSY') - await new Promise(async (resolve) => { + await new Promise(async (resolve, reject) => { console.log('Waiting 6 seconds...') setTimeout(async () => { - // should still be locked and busy - assert.equal(wallet.isLocked, true) - assert.equal(Ledger.status, 'BUSY') - resolve(null) + try { + // should still be locked and busy + assert.equal(wallet.isLocked, true) + assert.equal(Ledger.status, 'BUSY') + resolve(null) + } catch (err) { + reject(err) + } }, 6000) }) @@ -75,13 +79,17 @@ await Promise.all([ assert.equal(wallet.isLocked, true) assert.equal(Ledger.status, 'LOCKED') - await new Promise(async (resolve) => { + await new Promise(async (resolve, reject) => { console.log('Waiting 6 seconds...') setTimeout(async () => { - // should still be locked - assert.equal(wallet.isLocked, true) - assert.equal(Ledger.status, 'LOCKED') - resolve(null) + try { + // should still be locked + assert.equal(wallet.isLocked, true) + assert.equal(Ledger.status, 'LOCKED') + resolve(null) + } catch (err) { + reject(err) + } }, 6000) }) @@ -94,23 +102,31 @@ await Promise.all([ assert.equal(wallet.isLocked, false) assert.equal(Ledger.status, 'CONNECTED') - await new Promise(async (resolve) => { + await new Promise(async (resolve, reject) => { console.log('Waiting 6 seconds...') setTimeout(async () => { - // should still be unlocked - assert.equal(wallet.isLocked, false) - assert.equal(Ledger.status, 'CONNECTED') - resolve(null) + try { + // should still be unlocked + assert.equal(wallet.isLocked, false) + assert.equal(Ledger.status, 'CONNECTED') + resolve(null) + } catch (err) { + reject(err) + } }, 6000) }) - await new Promise(async (resolve) => { + await new Promise(async (resolve, reject) => { console.log('Waiting 90 seconds...') setTimeout(async () => { - // should now be locked - assert.equal(wallet.isLocked, true) - assert.equal(Ledger.status, 'LOCKED') - resolve(null) + try { + // should now be locked + assert.equal(wallet.isLocked, true) + assert.equal(Ledger.status, 'LOCKED') + resolve(null) + } catch (err) { + reject(err) + } }, 90000) }) diff --git a/test/test.lock-unlock.mjs b/test/test.lock-unlock.mjs index f87f88f..db3b636 100644 --- a/test/test.lock-unlock.mjs +++ b/test/test.lock-unlock.mjs @@ -135,37 +135,49 @@ await Promise.all([ assert.ok(await wallet.verify(NANO_TEST_VECTORS.MNEMONIC)) assert.ok(await wallet.verify(NANO_TEST_VECTORS.BIP39_SEED)) - await new Promise(async (resolve) => { + await new Promise(async (resolve, reject) => { console.log('Waiting 1 minute...') setTimeout(async () => { - // should still be unlocked - assert.equal(wallet.isLocked, false) - const account = await wallet.account(0) - assert.equal(account.address, NANO_TEST_VECTORS.ADDRESS_0) - resolve(null) + try { + // should still be unlocked + assert.equal(wallet.isLocked, false) + const account = await wallet.account(0) + assert.equal(account.address, NANO_TEST_VECTORS.ADDRESS_0) + resolve(null) + } catch (err) { + reject(err) + } }, 60000) }) - await new Promise(async (resolve) => { + await new Promise(async (resolve, reject) => { console.log('Timer should be reset, waiting 1 minute...') setTimeout(async () => { - // should still be unlocked from account() reset and not initial unlock - assert.equal(wallet.isLocked, false) - assert.equal(await wallet.verify(NANO_TEST_VECTORS.MNEMONIC), true) - assert.equal(await wallet.verify(NANO_TEST_VECTORS.BIP39_SEED), true) - resolve(null) + try { + // should still be unlocked from account() reset and not initial unlock + assert.equal(wallet.isLocked, false) + assert.equal(await wallet.verify(NANO_TEST_VECTORS.MNEMONIC), true) + assert.equal(await wallet.verify(NANO_TEST_VECTORS.BIP39_SEED), true) + resolve(null) + } catch (err) { + reject(err) + } }, 60000) }) - await new Promise(async (resolve) => { + await new Promise(async (resolve, reject) => { console.log('Timer should not be reset by verify, waiting 1 minute...') setTimeout(async () => { - // should be locked from account() reset and not reset by verify() - assert.equal(wallet.isLocked, true) - await assert.rejects(wallet.verify(NANO_TEST_VECTORS.MNEMONIC)) - await assert.rejects(wallet.verify(NANO_TEST_VECTORS.BIP39_SEED)) - await assert.resolves(wallet.destroy()) - resolve(null) + try { + // should be locked from account() reset and not reset by verify() + assert.equal(wallet.isLocked, true) + await assert.rejects(wallet.verify(NANO_TEST_VECTORS.MNEMONIC)) + await assert.rejects(wallet.verify(NANO_TEST_VECTORS.BIP39_SEED)) + await assert.resolves(wallet.destroy()) + resolve(null) + } catch (err) { + reject(err) + } }, 60000) }) }) @@ -177,24 +189,32 @@ await Promise.all([ assert.equal(wallet.isLocked, false) await wallet.config({ timeout: 10 }) - await new Promise(async (resolve) => { + await new Promise(async (resolve, reject) => { console.log('Waiting 6 seconds...') setTimeout(async () => { - // should still be unlocked - assert.equal(wallet.isLocked, false) - assert.ok(await wallet.verify(NANO_TEST_VECTORS.MNEMONIC)) - resolve(null) + try { + // should still be unlocked + assert.equal(wallet.isLocked, false) + assert.ok(await wallet.verify(NANO_TEST_VECTORS.MNEMONIC)) + resolve(null) + } catch (err) { + reject(err) + } }, 6000) }) - await new Promise(async (resolve) => { + await new Promise(async (resolve, reject) => { console.log('Timer should not be reset by verify, waiting 6 more seconds...') setTimeout(async () => { - // should be locked from account() reset and not reset by verify() - assert.equal(wallet.isLocked, true) - await assert.rejects(wallet.verify(NANO_TEST_VECTORS.MNEMONIC)) - await assert.resolves(wallet.destroy()) - resolve(null) + try { + // should be locked from account() reset and not reset by verify() + assert.equal(wallet.isLocked, true) + await assert.rejects(wallet.verify(NANO_TEST_VECTORS.MNEMONIC)) + await assert.resolves(wallet.destroy()) + resolve(null) + } catch (err) { + reject(err) + } }, 6000) }) })