Bläddra i källkod

Decaf cleanup: error handling

Eric Mc Sween 6 år sedan
förälder
incheckning
abb7e8fa20

+ 8 - 3
services/document-updater/test/acceptance/js/helpers/DocUpdaterClient.js

@@ -1,6 +1,5 @@
 /* eslint-disable
 /* eslint-disable
     camelcase,
     camelcase,
-    handle-callback-err,
 */
 */
 let DocUpdaterClient
 let DocUpdaterClient
 const Settings = require('settings-sharelatex')
 const Settings = require('settings-sharelatex')
@@ -57,9 +56,12 @@ module.exports = DocUpdaterClient = {
       const jobs = updates.map((update) => (callback) => {
       const jobs = updates.map((update) => (callback) => {
         DocUpdaterClient.sendUpdate(project_id, doc_id, 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)
         DocUpdaterClient.waitForPendingUpdates(project_id, doc_id, callback)
-      )
+      })
     })
     })
   },
   },
 
 
@@ -68,6 +70,9 @@ module.exports = DocUpdaterClient = {
       { times: 30, interval: 100 },
       { times: 30, interval: 100 },
       (cb) =>
       (cb) =>
         rclient.llen(keys.pendingUpdates({ doc_id }), (err, length) => {
         rclient.llen(keys.pendingUpdates({ doc_id }), (err, length) => {
+          if (err) {
+            return cb(err)
+          }
           if (length > 0) {
           if (length > 0) {
             cb(new Error('updates still pending'))
             cb(new Error('updates still pending'))
           } else {
           } else {