jest

dotabod · Aug 31, 2023 · f60bf37 · f60bf37
1 parent c4aa511
commit f60bf37
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 18 deletions.
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -74,7 +74,7 @@ services:
         - BUILD_CONTEXT=packages/dota
     hostname: dota
     ports:
-      - "81:5000"
+      - "81:5120"
       - "9229:9229"
     environment:
       - D2PT_TOKEN

diff --git a/packages/dota/src/__tests__/setup-jest.ts b/packages/dota/src/__tests__/setup-jest.ts
@@ -14,11 +14,14 @@ beforeAll((done) => {
 
   const interval = setInterval(() => {
     apiClient
-      .post('/')
+      .get('/')
       .then((response) => {
         if (response?.data) {
+          console.log('response.data', response.data)
           clearInterval(interval) // Stop the interval
-          done() // Continue with the tests
+          setTimeout(() => {
+            done() // Continue with the tests
+          }, 3000)
         }
       })
       .catch((error) => {

diff --git a/packages/dota/src/dota/events/gsi-events/__tests__/event.aegis_denied.test.ts.x b/packages/dota/src/dota/events/gsi-events/__tests__/event.aegis_denied.test.ts.x
@@ -105,9 +105,9 @@ describe('aegis denied', () => {
 
   // check memory usage
   it('should not leak memory', () => {
-    const used = process.memoryUsage()
-    console.log('memory', used.heapUsed / 1000000)
+    const { heapUsed } = process.memoryUsage()
+    const mb = heapUsed / 1000000
     // value in megabytes
-    expect(used.heapUsed / 1000000).toBeLessThan(350_000)
+    expect(mb).toBeLessThan(350)
   })
 })
diff --git a/packages/dota/src/dota/events/gsi-events/__tests__/event.aegis_picked_up.test.ts b/packages/dota/src/dota/events/gsi-events/__tests__/event.aegis_picked_up.test.ts
@@ -7,7 +7,7 @@ import { DotaEventTypes } from '../../../../types.js'
 
 describe('aegis picked up', () => {
   // might be less than 100 if some users are offline
-  let USER_COUNT = 200
+  let USER_COUNT = 50
 
   const promises: Promise<any>[] = []
 
@@ -74,9 +74,13 @@ describe('aegis picked up', () => {
         const callLength = twitchChatSpy.mock.calls.filter(([, message]) =>
           message.match(/(?:picked|подбирает)/i),
         ).length
-
+        const { heapUsed, rss } = process.memoryUsage()
+        const mb = rss / 1000000
         try {
           expect(callLength).toBe(USER_COUNT)
+
+          expect(mb).toBeLessThan(400)
+
           clearInterval(interval)
           done()
         } catch (e) {
@@ -89,10 +93,10 @@ describe('aegis picked up', () => {
           consecutiveSameCount = 0
         }
 
-        if (consecutiveSameCount > 5) {
+        if (consecutiveSameCount > 2) {
           clearInterval(interval)
           done(
-            `call count ${USER_COUNT} ${currentCallCount} ${twitchChatSpy.mock.calls.length} did not change for 5 intervals`,
+            `call count ${USER_COUNT} ${currentCallCount} ${twitchChatSpy.mock.calls.length} and mb use ${mb}`,
           )
         }
 
@@ -103,11 +107,23 @@ describe('aegis picked up', () => {
     USER_COUNT * 1000,
   )
 
-  // check memory usage
-  it('should not leak memory', () => {
-    const used = process.memoryUsage()
-    console.log('memory', used.heapUsed / 1000000)
-    // value in megabytes
-    expect(used.heapUsed / 1000000).toBeLessThan(350_000)
-  })
+  it('should still access server', (done) => {
+    const interval = setInterval(() => {
+      apiClient
+        .get('/')
+        .then((response) => {
+          if (response?.data) {
+            console.log('response.data', response.data)
+            clearInterval(interval) // Stop the interval
+            setTimeout(() => {
+              done() // Continue with the tests
+            }, 3000)
+          }
+        })
+        .catch((error) => {
+          // Handle error, perhaps log it but don't call done(error) here
+          // because we're inside an interval and it will keep calling
+        })
+    }, 500) // Check every 1 second
+  }, 5000)
 })
diff --git a/services/nginx/default.conf b/services/nginx/default.conf
@@ -35,7 +35,7 @@ server {
   }
 
   location / {
-      proxy_pass http://dota:5000;
+      proxy_pass http://dota:5120;
       proxy_http_version 1.1;
       proxy_set_header Upgrade $http_upgrade;
       proxy_set_header Connection 'upgrade';