chore: Fix tests

tolgee · Aug 7, 2023 · f3d78cc · f3d78cc
1 parent e74b104
commit f3d78cc
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 16 deletions.
diff --git a/backend/app/build.gradle b/backend/app/build.gradle
@@ -183,6 +183,7 @@ task runStandardTests(type: Test, group: 'verification') {
     useJUnitPlatform {
         excludeTags "contextRecreating", "websocket"
     }
+    maxHeapSize = "8000m"
 }
 
 task runWebsocketTests(type: Test, group: 'verification') {

diff --git a/backend/app/src/test/resources/application.yaml b/backend/app/src/test/resources/application.yaml
@@ -75,12 +75,12 @@ tolgee:
   telemetry:
     enabled: false
     server: http://localhost:8080
-#logging:
-#  level:
-#    io.tolgee.billing.api.v2.OrganizationInvoicesController: DEBUG
-#    io.tolgee.batch.BatchJobActionService: DEBUG
-#    io.tolgee.component.atomicLong.AtomicLongProvider: DEBUG
-#    io.tolgee.batch: TRACE
+logging:
+  level:
+    io.tolgee.billing.api.v2.OrganizationInvoicesController: DEBUG
+    io.tolgee.batch.BatchJobActionService: DEBUG
+    io.tolgee.component.atomicLong.AtomicLongProvider: DEBUG
+    io.tolgee.batch: DEBUG
 #    org.springframework.orm.jpa: DEBUG
 #    org.springframework.transaction: DEBUG
 #    org.hibernate.type: TRACE
diff --git a/backend/data/src/main/kotlin/io/tolgee/batch/BatchJobConcurrentLauncher.kt b/backend/data/src/main/kotlin/io/tolgee/batch/BatchJobConcurrentLauncher.kt
@@ -3,6 +3,7 @@ package io.tolgee.batch
 import io.sentry.Sentry
 import io.tolgee.component.CurrentDateProvider
 import io.tolgee.configuration.tolgee.BatchProperties
+import io.tolgee.fixtures.waitFor
 import io.tolgee.util.Logging
 import io.tolgee.util.logger
 import kotlinx.coroutines.CoroutineScope
@@ -28,7 +29,17 @@ class BatchJobConcurrentLauncher(
   }
 
   val runningJobs: ConcurrentHashMap<Long, Pair<Long, Job>> = ConcurrentHashMap()
+
   var pause = false
+    set(value) {
+      field = value
+      if (value) {
+        waitFor(30000) {
+          runningJobs.size == 0
+        }
+      }
+    }
+
   var masterRunJob: Job? = null
   var run = true
 
@@ -106,12 +117,12 @@ class BatchJobConcurrentLauncher(
         "Pulled ${items.size} items from queue: " +
           items.joinToString(", ") { it.chunkExecutionId.toString() }
       )
+      logger.debug(
+        "${batchJobChunkExecutionQueue.size} is left in the queue " +
+          "(${System.identityHashCode(batchJobChunkExecutionQueue)}): " +
+          batchJobChunkExecutionQueue.joinToString(", ") { it.chunkExecutionId.toString() }
+      )
     }
-    logger.debug(
-      "${batchJobChunkExecutionQueue.size} is left in the queue " +
-        "(${System.identityHashCode(batchJobChunkExecutionQueue)}): " +
-        batchJobChunkExecutionQueue.joinToString(", ") { it.chunkExecutionId.toString() }
-    )
   }
 
   private fun CoroutineScope.handleItem(

diff --git a/backend/testing/src/main/kotlin/io/tolgee/CleanDbTestListener.kt b/backend/testing/src/main/kotlin/io/tolgee/CleanDbTestListener.kt
@@ -1,5 +1,6 @@
 package io.tolgee
 
+import io.tolgee.batch.BatchJobChunkExecutionQueue
 import io.tolgee.batch.BatchJobConcurrentLauncher
 import kotlinx.coroutines.TimeoutCancellationException
 import org.postgresql.util.PSQLException
@@ -25,14 +26,15 @@ class CleanDbTestListener : TestExecutionListener {
 
   override fun beforeTestMethod(testContext: TestContext) {
     val appContext: ApplicationContext = testContext.applicationContext
-    val jobChunkExecutionQueue = appContext.getBean(BatchJobConcurrentLauncher::class.java)
-    jobChunkExecutionQueue.pause = true
+    val batchJobConcurrentLauncher = appContext.getBean(BatchJobConcurrentLauncher::class.java)
+    val batchJobQueue = appContext.getBean(BatchJobChunkExecutionQueue::class.java)
 
     if (!shouldClenBeforeClass(testContext)) {
+      batchJobConcurrentLauncher.pause = true
+      batchJobQueue.clear()
       cleanWithRetries(testContext)
+      batchJobConcurrentLauncher.pause = false
     }
-
-    jobChunkExecutionQueue.pause = false
   }
 
   private fun cleanWithRetries(testContext: TestContext) {

diff --git a/e2e/cypress/e2e/organizations/organizationsList.cy.ts b/e2e/cypress/e2e/organizations/organizationsList.cy.ts
@@ -58,7 +58,7 @@ describe('Organization List', () => {
     cy.contains('Organization created').should('be.visible');
   });
 
-  it('validates creation fields', () => {
+  it('validates creation fields', { retries: { runMode: 3 } }, () => {
     goToNewOrganizationForm();
     gcy('organization-name-field').within(() => {
       cy.get('input').type('aaa').clear();