Merge pull request #32 from alexkvak/test/increase-redis-timeout

test: increase timeout for redis
Tinkoff · Jun 24, 2020 · 87f70e0 · 87f70e0
2 parents 13ae88e + 32d143a
commit 87f70e0
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 9 deletions.
diff --git a/tests/integration/base-redis.spec.ts b/tests/integration/base-redis.spec.ts
@@ -4,7 +4,7 @@ import RedisStorageAdapter from "../../src/adapters/RedisStorageAdapter";
 import { BaseStorage } from "../../src/storage/BaseStorage";
 
 const redis = new Redis();
-const adapter = new RedisStorageAdapter(redis);
+const adapter = new RedisStorageAdapter(redis, { operationTimeout: 9000 });
 const prefix = "cache";
 const storage = new BaseStorage({ adapter, prefix });
 

diff --git a/tests/integration/cache.spec.ts b/tests/integration/cache.spec.ts
@@ -17,10 +17,12 @@ const redis = new Redis({
   autoResendUnfulfilledCommands: false,
 });
 const cache = new Cache({
-  adapter: new RedisStorageAdapter(redis),
+  adapter: new RedisStorageAdapter(redis, { operationTimeout: 9000 }),
   logger,
 });
 
+const REDIS_OPERATION_DELAY = 1000;
+
 describe("Cache", () => {
   beforeEach(
     () =>
@@ -58,7 +60,7 @@ describe("Cache", () => {
     const key = uuid();
 
     await expect(cache.get(key, () => struct)).resolves.toEqual(struct);
-    await timeout(100);
+    await timeout(REDIS_OPERATION_DELAY);
     await expect(cache.get(key, jest.fn)).resolves.toEqual(struct);
   });
 
@@ -68,7 +70,7 @@ describe("Cache", () => {
 
     await cache.set(key, struct);
     redis.disconnect();
-    await timeout(100);
+    await timeout(REDIS_OPERATION_DELAY);
     await expect(cache.get(key, async () => struct)).resolves.toEqual(struct);
   });
 
@@ -81,7 +83,7 @@ describe("Cache", () => {
 
     await cache.set(key, struct);
     redis.disconnect();
-    await timeout(100);
+    await timeout(REDIS_OPERATION_DELAY);
     await expect(cache.get(key, executor)).rejects.toThrowErrorMatchingInlineSnapshot(
       `"connection timed out"`
     );
@@ -93,7 +95,7 @@ describe("Cache", () => {
     const key = uuid();
 
     await expect(cache.get(key, () => struct, { tags })).resolves.toEqual(struct);
-    await timeout(100);
+    await timeout(REDIS_OPERATION_DELAY);
     await expect(cache.get(key, jest.fn, { tags })).resolves.toEqual(struct);
   });
 
@@ -104,10 +106,10 @@ describe("Cache", () => {
     const key = uuid();
 
     await expect(cache.get(key, executor, { tags })).resolves.toEqual(struct);
-    await timeout(100);
+    await timeout(REDIS_OPERATION_DELAY);
     await expect(cache.get(key, jest.fn, { tags })).resolves.toEqual(struct);
     await cache.touch(tags);
-    await timeout(50);
+    await timeout(REDIS_OPERATION_DELAY);
 
     struct.a = 5;
 

diff --git a/tests/integration/redis.spec.ts b/tests/integration/redis.spec.ts
@@ -3,7 +3,7 @@ import RedisStorageAdapter from "../../src/adapters/RedisStorageAdapter";
 import { runAdapterTests } from "./adapter-agnostic";
 
 const redis = new Redis();
-const adapter = new RedisStorageAdapter(redis, { lockExpireTimeout: 50, operationTimeout: 4000 });
+const adapter = new RedisStorageAdapter(redis, { lockExpireTimeout: 50, operationTimeout: 9000 });
 
 describe("Redis adapter", () => {
   beforeEach(() => {

diff --git a/tests/jest.config.js b/tests/jest.config.js
@@ -10,4 +10,5 @@ module.exports = {
   transform: {
     '^.+\\.ts$': 'ts-jest',
   },
+  testTimeout: 10000,
 };