From 2a3cb615ee2dcbe56e6cb2a53c983550b5dd2e5b Mon Sep 17 00:00:00 2001 From: Jessica Lawshe Date: Tue, 29 Sep 2020 09:29:51 -0500 Subject: [PATCH] Merge pull request #3241 from overleaf/jpa-speedup-acceptance-tests [misc] speedup the ConvertArchivedState test suite GitOrigin-RevId: e7d6471955aabbc6af76e27fdf23d97e2fd87901 --- services/web/scripts/helpers/batchedUpdate.js | 3 ++- .../test/acceptance/src/ConvertArchivedState.js | 17 ++++++++++------- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/services/web/scripts/helpers/batchedUpdate.js b/services/web/scripts/helpers/batchedUpdate.js index 2b9a676c1a..bce52a41e3 100644 --- a/services/web/scripts/helpers/batchedUpdate.js +++ b/services/web/scripts/helpers/batchedUpdate.js @@ -33,7 +33,8 @@ async function batchedUpdate(collectionName, query, update, projection) { // Some secondary connections are not ready as it returns, leading to // failing cursor actions with a readPreference set to 'secondary'. // TODO(das7pad): revisit/remove this delay after the mongo-driver update. - await Promise.all([getNativeDb(), promisify(setTimeout)(10 * 1000)]) + const CONNECT_DELAY = parseInt(process.env.CONNECT_DELAY, 10) || 10000 + await Promise.all([getNativeDb(), promisify(setTimeout)(CONNECT_DELAY)]) const db = await getNativeDb() const collection = db.collection(collectionName) diff --git a/services/web/test/acceptance/src/ConvertArchivedState.js b/services/web/test/acceptance/src/ConvertArchivedState.js index 0681710687..2be3b60033 100644 --- a/services/web/test/acceptance/src/ConvertArchivedState.js +++ b/services/web/test/acceptance/src/ConvertArchivedState.js @@ -67,14 +67,17 @@ describe('ConvertArchivedState', function() { }) beforeEach(function(done) { - exec('node scripts/convert_archived_state.js', (error, stdout, stderr) => { - console.log(stdout) - console.error(stderr) - if (error) { - return done(error) + exec( + 'CONNECT_DELAY=1 node scripts/convert_archived_state.js', + (error, stdout, stderr) => { + console.log(stdout) + console.error(stderr) + if (error) { + return done(error) + } + done() } - done() - }) + ) }) describe('main method', function() {