From 66d26ff44b503912935ff9cd07a2a9754a759acb Mon Sep 17 00:00:00 2001 From: Mo Date: Tue, 1 Aug 2023 18:38:40 -0500 Subject: [PATCH] chore: test timeout --- packages/snjs/mocha/lib/Utils.js | 10 ++++++---- packages/snjs/mocha/lib/factory.js | 1 + packages/snjs/mocha/sync_tests/online.test.js | 4 ++-- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/packages/snjs/mocha/lib/Utils.js b/packages/snjs/mocha/lib/Utils.js index dbb35019b..6437b026d 100644 --- a/packages/snjs/mocha/lib/Utils.js +++ b/packages/snjs/mocha/lib/Utils.js @@ -11,17 +11,19 @@ export async function safeDeinit(application) { await application.storage.awaitPersist() /** Limit waiting to 1s */ - await Promise.race([sleep(1, 'Deinit'), application.sync?.awaitCurrentSyncs()]) + await Promise.race([sleep(1, 'Deinit', true), application.sync?.awaitCurrentSyncs()]) await application.prepareForDeinit() application.deinit(DeinitMode.Soft, DeinitSource.SignOut) } -export async function sleep(seconds, reason) { - console.warn(`Test sleeping for ${seconds}s. Reason: ${reason}`) +export async function sleep(seconds, reason, noLog = false) { + if (!noLog) { + console.warn(`Test sleeping for ${seconds}s. Reason: ${reason}`) + } - return new Promise((resolve, reject) => { + return new Promise((resolve) => { setTimeout(function () { resolve() }, seconds * 1000) diff --git a/packages/snjs/mocha/lib/factory.js b/packages/snjs/mocha/lib/factory.js index b4a0a0582..d62502ea4 100644 --- a/packages/snjs/mocha/lib/factory.js +++ b/packages/snjs/mocha/lib/factory.js @@ -11,6 +11,7 @@ import { createItemParams, createNoteParams, createTagParams } from './Items.js' export const TenSecondTimeout = 10_000 export const TwentySecondTimeout = 20_000 export const ThirtySecondTimeout = 30_000 +export const SixtySecondTimeout = 60_000 export const syncOptions = { checkIntegrity: true, diff --git a/packages/snjs/mocha/sync_tests/online.test.js b/packages/snjs/mocha/sync_tests/online.test.js index 1c8731067..fe60e897f 100644 --- a/packages/snjs/mocha/sync_tests/online.test.js +++ b/packages/snjs/mocha/sync_tests/online.test.js @@ -540,7 +540,7 @@ describe('online syncing', function () { await this.application.sync.sync(syncOptions) const rawPayloads = await this.application.storage.getAllRawPayloads() expect(rawPayloads.length).to.equal(this.expectedItemCount) - }).timeout(Factory.TwentySecondTimeout) + }).timeout(Factory.SixtySecondTimeout) it('should handle downloading with sync pagination', async function () { const largeItemCount = SyncUpDownLimit + 10 @@ -567,7 +567,7 @@ describe('online syncing', function () { const rawPayloads = await this.application.storage.getAllRawPayloads() expect(rawPayloads.length).to.equal(this.expectedItemCount) - }).timeout(30000) + }).timeout(Factory.SixtySecondTimeout) it('syncing an item should storage it encrypted', async function () { const note = await Factory.createMappedNote(this.application)