From abb7e8fa20908700c839b2600dd8b3489e43d56a Mon Sep 17 00:00:00 2001 From: Eric Mc Sween Date: Wed, 20 May 2020 16:08:03 -0400 Subject: [PATCH] Decaf cleanup: error handling --- .../test/acceptance/js/helpers/DocUpdaterClient.js | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/services/document-updater/test/acceptance/js/helpers/DocUpdaterClient.js b/services/document-updater/test/acceptance/js/helpers/DocUpdaterClient.js index ebd1a5b1a0..a3b15942d5 100644 --- a/services/document-updater/test/acceptance/js/helpers/DocUpdaterClient.js +++ b/services/document-updater/test/acceptance/js/helpers/DocUpdaterClient.js @@ -1,6 +1,5 @@ /* eslint-disable camelcase, - handle-callback-err, */ let DocUpdaterClient const Settings = require('settings-sharelatex') @@ -57,9 +56,12 @@ module.exports = DocUpdaterClient = { const jobs = updates.map((update) => (callback) => { DocUpdaterClient.sendUpdate(project_id, doc_id, update, callback) }) - async.series(jobs, (err) => + async.series(jobs, (err) => { + if (err) { + return callback(err) + } DocUpdaterClient.waitForPendingUpdates(project_id, doc_id, callback) - ) + }) }) }, @@ -68,6 +70,9 @@ module.exports = DocUpdaterClient = { { times: 30, interval: 100 }, (cb) => rclient.llen(keys.pendingUpdates({ doc_id }), (err, length) => { + if (err) { + return cb(err) + } if (length > 0) { cb(new Error('updates still pending')) } else {