Fix cache stop error handling. Closes hapijs#3711

hueniverse · hueniverse · commit e28094f70fbd · 2017-12-19T17:33:21.000-08:00
diff --git a/lib/core.js b/lib/core.js
@@ -359,7 +359,10 @@ exports = module.exports = internals.Core = class {
                 await this._unlisten(options);
             }
 
-            this.caches.forEach((cache) => cache.client.stop());
+            const caches = [];
+            this.caches.forEach((cache) => caches.push(cache.client.stop()));
+            await Promise.all(caches);
+
             await this.events.emit('stop');
             this.heavy.stop();
             await this._invoke('onPostStop');
diff --git a/test/core.js b/test/core.js
@@ -531,6 +531,23 @@ describe('Core', () => {
             await expect(server.stop()).to.reject('Cannot stop server while in stopping phase');
             await stopping;
         });
+
+        it('errors on bad cache stop', async () => {
+
+            const cache = {
+                engine: {
+                    start: function () { },
+                    stop: function () {
+
+                        throw new Error('oops');
+                    }
+                }
+            };
+
+            const server = Hapi.server({ cache });
+            await server.start();
+            await expect(server.stop()).to.reject('oops');
+        });
     });
 
     describe('_init()', () => {
