tests: Cleanup redis pool properly in tests (#458)

cube-js · Feb 29, 2020 · 6c8b6b3 · 6c8b6b3
1 parent 3fe55ea
commit 6c8b6b3
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/packages/cubejs-query-orchestrator/orchestrator/QueryOrchestrator.js b/packages/cubejs-query-orchestrator/orchestrator/QueryOrchestrator.js
@@ -18,6 +18,7 @@ class QueryOrchestrator {
       throw new Error(`Only 'redis' or 'memory' are supported for cacheAndQueueDriver option`);
     }
 
+    this.redisPool = redisPool;
     this.queryCache = new QueryCache(
       this.redisPrefix, this.driverFactory, this.logger, {
         externalDriverFactory,
@@ -87,6 +88,10 @@ class QueryOrchestrator {
   resultFromCacheIfExists(queryBody) {
     return this.queryCache.resultFromCacheIfExists(queryBody);
   }
+
+  async cleanup() {
+    await this.redisPool.cleanup();
+  }
 }
 
 module.exports = QueryOrchestrator;
diff --git a/packages/cubejs-query-orchestrator/test/QueryOrchestrator.test.js b/packages/cubejs-query-orchestrator/test/QueryOrchestrator.test.js
@@ -32,14 +32,17 @@ class MockDriver {
 
 describe('QueryOrchestrator', () => {
   let mockDriver = null;
+  const queryOrchestrator = new QueryOrchestrator(
+    'TEST', async () => mockDriver, (msg, params) => console.log(msg, params)
+  );
 
   beforeAll(() => {
     mockDriver = new MockDriver();
   });
 
-  const queryOrchestrator = new QueryOrchestrator(
-    'TEST', async () => mockDriver, (msg, params) => console.log(msg, params)
-  );
+  afterAll(async () => {
+    await queryOrchestrator.cleanup();
+  });
 
   test('basic', async () => {
     const query = {