From fce3992943450705e3690a32e08a28f35cc2cd33 Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Fri, 22 Oct 2021 15:16:15 -0300
Subject: [PATCH] Fix integration test after merge race condition

---
 .../mailbox/core/files/FileManagerIntegrationTest.kt          | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/mailbox-core/src/test/java/org/briarproject/mailbox/core/files/FileManagerIntegrationTest.kt b/mailbox-core/src/test/java/org/briarproject/mailbox/core/files/FileManagerIntegrationTest.kt
index ef5cd616..8c1e0901 100644
--- a/mailbox-core/src/test/java/org/briarproject/mailbox/core/files/FileManagerIntegrationTest.kt
+++ b/mailbox-core/src/test/java/org/briarproject/mailbox/core/files/FileManagerIntegrationTest.kt
@@ -13,6 +13,7 @@ import org.briarproject.mailbox.core.TestUtils.getNewRandomId
 import org.briarproject.mailbox.core.server.IntegrationTest
 import org.junit.jupiter.api.AfterEach
 import org.junit.jupiter.api.Assertions.assertArrayEquals
+import org.junit.jupiter.api.BeforeEach
 import org.junit.jupiter.api.Test
 import kotlin.random.Random
 import kotlin.test.assertEquals
@@ -21,7 +22,8 @@ class FileManagerIntegrationTest : IntegrationTest() {
 
     private val bytes = Random.nextBytes(2048)
 
-    override fun initDb() {
+    @BeforeEach
+    fun initDb() {
         addOwnerToken()
         addContact(contact1)
         addContact(contact2)
-- 
GitLab