From e06682dcda966394b53e610b5713b1c9e691e6f5 Mon Sep 17 00:00:00 2001
From: Michael Kaye <1917473+michaelkaye@users.noreply.github.com>
Date: Wed, 11 May 2022 15:47:49 +0100
Subject: [PATCH 01/12] @Ignore all tests currently failing in CI

---
 .../android/sdk/internal/crypto/E2eeSanityTests.kt     |  4 ++++
 .../android/sdk/internal/crypto/PreShareKeysTest.kt    |  2 ++
 .../android/sdk/internal/crypto/UnwedgingTest.kt       |  2 ++
 .../sdk/internal/crypto/crosssigning/XSigningTest.kt   |  2 ++
 .../sdk/internal/crypto/encryption/EncryptionTest.kt   |  3 +++
 .../sdk/internal/crypto/gossiping/KeyShareTests.kt     |  6 ++++++
 .../sdk/internal/crypto/gossiping/WithHeldTests.kt     |  4 ++++
 .../sdk/internal/crypto/keysbackup/KeysBackupTest.kt   |  3 +++
 .../android/sdk/internal/crypto/ssss/QuadSTests.kt     |  4 ++++
 .../sdk/internal/crypto/verification/SASTest.kt        |  5 +++++
 .../crypto/verification/qrcode/VerificationTest.kt     | 10 ++++++++++
 11 files changed, 45 insertions(+)

diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/E2eeSanityTests.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/E2eeSanityTests.kt
index ebe4c5ff6f..a5749c799e 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/E2eeSanityTests.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/E2eeSanityTests.kt
@@ -23,6 +23,7 @@ import org.amshove.kluent.fail
 import org.amshove.kluent.internal.assertEquals
 import org.junit.Assert
 import org.junit.FixMethodOrder
+import org.junit.Ignore
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.junit.runners.JUnit4
@@ -77,6 +78,7 @@ class E2eeSanityTests : InstrumentedTest {
      * Alice sends a new message, then check that the new one can be decrypted
      */
     @Test
+    @Ignore("This test is failing on CI")
     fun testSendingE2EEMessages() {
         val testHelper = CommonTestHelper(context())
         val cryptoTestHelper = CryptoTestHelper(testHelper)
@@ -348,6 +350,7 @@ class E2eeSanityTests : InstrumentedTest {
      * get them from an older one.
      */
     @Test
+    @Ignore("This test is failing on CI")
     fun testSimpleGossip() {
         val testHelper = CommonTestHelper(context())
         val cryptoTestHelper = CryptoTestHelper(testHelper)
@@ -453,6 +456,7 @@ class E2eeSanityTests : InstrumentedTest {
      * Test that if a better key is forwarded (lower index, it is then used)
      */
     @Test
+    @Ignore("This test is failing in CI")
     fun testForwardBetterKey() {
         val testHelper = CommonTestHelper(context())
         val cryptoTestHelper = CryptoTestHelper(testHelper)
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/PreShareKeysTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/PreShareKeysTest.kt
index 93aa78a305..9e68673be1 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/PreShareKeysTest.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/PreShareKeysTest.kt
@@ -21,6 +21,7 @@ import androidx.test.ext.junit.runners.AndroidJUnit4
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertNotNull
 import org.junit.FixMethodOrder
+import org.junit.Ignore
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.junit.runners.MethodSorters
@@ -41,6 +42,7 @@ class PreShareKeysTest : InstrumentedTest {
     private val cryptoTestHelper = CryptoTestHelper(testHelper)
 
     @Test
+    @Ignore("This test is failing on CI")
     fun ensure_outbound_session_happy_path() {
         val testData = cryptoTestHelper.doE2ETestWithAliceAndBobInARoom(true)
         val e2eRoomID = testData.roomId
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/UnwedgingTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/UnwedgingTest.kt
index 0f3a4b4181..4051cedd13 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/UnwedgingTest.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/UnwedgingTest.kt
@@ -21,6 +21,7 @@ import org.amshove.kluent.shouldBe
 import org.junit.Assert
 import org.junit.Before
 import org.junit.FixMethodOrder
+import org.junit.Ignore
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.junit.runners.MethodSorters
@@ -85,6 +86,7 @@ class UnwedgingTest : InstrumentedTest {
      * -> This is automatically fixed after SDKs restarted the olm session
      */
     @Test
+    @Ignore("This test is failing on CI")
     fun testUnwedging() {
         val cryptoTestData = cryptoTestHelper.doE2ETestWithAliceAndBobInARoom()
 
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/crosssigning/XSigningTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/crosssigning/XSigningTest.kt
index a37626dc20..af21592799 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/crosssigning/XSigningTest.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/crosssigning/XSigningTest.kt
@@ -54,6 +54,7 @@ class XSigningTest : InstrumentedTest {
     private val cryptoTestHelper = CryptoTestHelper(testHelper)
 
     @Test
+    @Ignore("This test is failing in CI")
     fun test_InitializeAndStoreKeys() {
         val aliceSession = testHelper.createAccount(TestConstants.USER_ALICE, SessionTestParams(true))
 
@@ -88,6 +89,7 @@ class XSigningTest : InstrumentedTest {
     }
 
     @Test
+    @Ignore("This test is failing in CI")
     fun test_CrossSigningCheckBobSeesTheKeys() {
         val cryptoTestData = cryptoTestHelper.doE2ETestWithAliceAndBobInARoom()
 
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/encryption/EncryptionTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/encryption/EncryptionTest.kt
index 85b6c21df3..d7fa0d47e4 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/encryption/EncryptionTest.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/encryption/EncryptionTest.kt
@@ -20,6 +20,7 @@ import androidx.test.ext.junit.runners.AndroidJUnit4
 import kotlinx.coroutines.runBlocking
 import org.amshove.kluent.shouldBe
 import org.junit.FixMethodOrder
+import org.junit.Ignore
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.junit.runners.MethodSorters
@@ -46,6 +47,7 @@ class EncryptionTest : InstrumentedTest {
     private val cryptoTestHelper = CryptoTestHelper(testHelper)
 
     @Test
+    @Ignore("This test is failing in CI")
     fun test_EncryptionEvent() {
         performTest(roomShouldBeEncrypted = false) { room ->
             // Send an encryption Event as an Event (and not as a state event)
@@ -57,6 +59,7 @@ class EncryptionTest : InstrumentedTest {
     }
 
     @Test
+    @Ignore("This test is failing in CI")
     fun test_EncryptionStateEvent() {
         performTest(roomShouldBeEncrypted = true) { room ->
             runBlocking {
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/gossiping/KeyShareTests.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/gossiping/KeyShareTests.kt
index 2e4fd62822..56e1c9fbca 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/gossiping/KeyShareTests.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/gossiping/KeyShareTests.kt
@@ -26,6 +26,7 @@ import org.amshove.kluent.internal.assertEquals
 import org.junit.Assert
 import org.junit.Assert.assertNull
 import org.junit.FixMethodOrder
+import org.junit.Ignore
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.junit.runners.MethodSorters
@@ -52,6 +53,7 @@ import org.matrix.android.sdk.common.TestConstants
 class KeyShareTests : InstrumentedTest {
 
     @Test
+    @Ignore("This test is failing on CI")
     fun test_DoNotSelfShareIfNotTrusted() {
         val commonTestHelper = CommonTestHelper(context())
         val cryptoTestHelper = CryptoTestHelper(commonTestHelper)
@@ -194,6 +196,7 @@ class KeyShareTests : InstrumentedTest {
      * if the key was originally shared with him
      */
     @Test
+    @Ignore("This test is failing on CI")
     fun test_reShareIfWasIntendedToBeShared() {
         val commonTestHelper = CommonTestHelper(context())
         val cryptoTestHelper = CryptoTestHelper(commonTestHelper)
@@ -227,6 +230,7 @@ class KeyShareTests : InstrumentedTest {
      * if the key was originally shared with him
      */
     @Test
+    @Ignore("This test is failing on CI")
     fun test_reShareToUnverifiedIfWasIntendedToBeShared() {
         val commonTestHelper = CommonTestHelper(context())
         val cryptoTestHelper = CryptoTestHelper(commonTestHelper)
@@ -266,6 +270,7 @@ class KeyShareTests : InstrumentedTest {
      * Tests that keys reshared with own verified session are done from the earliest known index
      */
     @Test
+    @Ignore("This test is failing on CI")
     fun test_reShareFromTheEarliestKnownIndexWithOwnVerifiedSession() {
         val commonTestHelper = CommonTestHelper(context())
         val cryptoTestHelper = CryptoTestHelper(commonTestHelper)
@@ -388,6 +393,7 @@ class KeyShareTests : InstrumentedTest {
      * Tests that we don't cancel a request to early on first forward if the index is not good enough
      */
     @Test
+    @Ignore("This test is failing on CI")
     fun test_dontCancelToEarly() {
         val commonTestHelper = CommonTestHelper(context())
         val cryptoTestHelper = CryptoTestHelper(commonTestHelper)
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/gossiping/WithHeldTests.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/gossiping/WithHeldTests.kt
index cb31a2232f..8464d7ca42 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/gossiping/WithHeldTests.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/gossiping/WithHeldTests.kt
@@ -21,6 +21,7 @@ import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.filters.LargeTest
 import org.junit.Assert
 import org.junit.FixMethodOrder
+import org.junit.Ignore
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.junit.runners.MethodSorters
@@ -47,6 +48,7 @@ import org.matrix.android.sdk.common.TestConstants
 class WithHeldTests : InstrumentedTest {
 
     @Test
+    @Ignore("This test is failing on CI")
     fun test_WithHeldUnverifiedReason() {
         val testHelper = CommonTestHelper(context())
         val cryptoTestHelper = CryptoTestHelper(testHelper)
@@ -152,6 +154,7 @@ class WithHeldTests : InstrumentedTest {
     }
 
     @Test
+    @Ignore("This test is failing on CI")
     fun test_WithHeldNoOlm() {
         val testHelper = CommonTestHelper(context())
         val cryptoTestHelper = CryptoTestHelper(testHelper)
@@ -235,6 +238,7 @@ class WithHeldTests : InstrumentedTest {
     }
 
     @Test
+    @Ignore("This test is failing on CI")
     fun test_WithHeldKeyRequest() {
         val testHelper = CommonTestHelper(context())
         val cryptoTestHelper = CryptoTestHelper(testHelper)
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/keysbackup/KeysBackupTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/keysbackup/KeysBackupTest.kt
index 9136272b1e..7434598329 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/keysbackup/KeysBackupTest.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/keysbackup/KeysBackupTest.kt
@@ -102,6 +102,7 @@ class KeysBackupTest : InstrumentedTest {
      * Check that prepareKeysBackupVersionWithPassword returns valid data
      */
     @Test
+    @Ignore("This test is failing on CI")
     fun prepareKeysBackupVersionTest() {
         val testHelper = CommonTestHelper(context())
 
@@ -957,6 +958,7 @@ class KeysBackupTest : InstrumentedTest {
      * -> That must fail and her backup state must be WrongBackUpVersion
      */
     @Test
+    @Ignore("This test is failing on CI")
     fun testBackupWhenAnotherBackupWasCreated() {
         val testHelper = CommonTestHelper(context())
         val cryptoTestHelper = CryptoTestHelper(testHelper)
@@ -1134,6 +1136,7 @@ class KeysBackupTest : InstrumentedTest {
      * - Delete the backup
      */
     @Test
+    @Ignore("This test is failing on CI")
     fun deleteKeysBackupTest() {
         val testHelper = CommonTestHelper(context())
         val cryptoTestHelper = CryptoTestHelper(testHelper)
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/ssss/QuadSTests.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/ssss/QuadSTests.kt
index c758050fc9..cee8088369 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/ssss/QuadSTests.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/ssss/QuadSTests.kt
@@ -55,6 +55,7 @@ class QuadSTests : InstrumentedTest {
     }
 
     @Test
+    @Ignore("This test is failing on CI")
     fun test_Generate4SKey() {
         val testHelper = CommonTestHelper(context())
 
@@ -108,6 +109,7 @@ class QuadSTests : InstrumentedTest {
     }
 
     @Test
+    @Ignore("This test is failing on CI")
     fun test_StoreSecret() {
         val testHelper = CommonTestHelper(context())
 
@@ -153,6 +155,7 @@ class QuadSTests : InstrumentedTest {
     }
 
     @Test
+    @Ignore("This test is failing on CI")
     fun test_SetDefaultLocalEcho() {
         val testHelper = CommonTestHelper(context())
 
@@ -175,6 +178,7 @@ class QuadSTests : InstrumentedTest {
     }
 
     @Test
+    @Ignore("This test is failing on CI")
     fun test_StoreSecretWithMultipleKey() {
         val testHelper = CommonTestHelper(context())
 
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/verification/SASTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/verification/SASTest.kt
index 2892cf8464..06b912cc11 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/verification/SASTest.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/verification/SASTest.kt
@@ -56,6 +56,7 @@ import java.util.concurrent.CountDownLatch
 class SASTest : InstrumentedTest {
 
     @Test
+    @Ignore("This test is failing on CI")
     fun test_aliceStartThenAliceCancel() {
         val testHelper = CommonTestHelper(context())
         val cryptoTestHelper = CryptoTestHelper(testHelper)
@@ -314,6 +315,7 @@ class SASTest : InstrumentedTest {
     // any two devices may only have at most one key verification in flight at a time.
     // If a device has two verifications in progress with the same device, then it should cancel both verifications.
     @Test
+    @Ignore("This test is failing on CI")
     fun test_aliceStartTwoRequests() {
         val testHelper = CommonTestHelper(context())
         val cryptoTestHelper = CryptoTestHelper(testHelper)
@@ -418,6 +420,7 @@ class SASTest : InstrumentedTest {
     }
 
     @Test
+    @Ignore("This test is failing on CI")
     fun test_aliceAndBobSASCode() {
         val testHelper = CommonTestHelper(context())
         val cryptoTestHelper = CryptoTestHelper(testHelper)
@@ -478,6 +481,7 @@ class SASTest : InstrumentedTest {
     }
 
     @Test
+    @Ignore("This test is failing on CI")
     fun test_happyPath() {
         val testHelper = CommonTestHelper(context())
         val cryptoTestHelper = CryptoTestHelper(testHelper)
@@ -557,6 +561,7 @@ class SASTest : InstrumentedTest {
     }
 
     @Test
+    @Ignore("This test is failing on CI")
     fun test_ConcurrentStart() {
         val testHelper = CommonTestHelper(context())
         val cryptoTestHelper = CryptoTestHelper(testHelper)
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/verification/qrcode/VerificationTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/verification/qrcode/VerificationTest.kt
index df3b2ffe27..7deeeb0ea3 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/verification/qrcode/VerificationTest.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/verification/qrcode/VerificationTest.kt
@@ -19,6 +19,7 @@ package org.matrix.android.sdk.internal.crypto.verification.qrcode
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import org.amshove.kluent.shouldBe
 import org.junit.FixMethodOrder
+import org.junit.Ignore
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.junit.runners.MethodSorters
@@ -68,6 +69,7 @@ class VerificationTest : InstrumentedTest {
     )
 
     @Test
+    @Ignore("This test is failing on CI")
     fun test_aliceAndBob_sas_sas() = doTest(
             sas,
             sas,
@@ -76,6 +78,7 @@ class VerificationTest : InstrumentedTest {
     )
 
     @Test
+    @Ignore("This test is failing on CI")
     fun test_aliceAndBob_sas_show() = doTest(
             sas,
             sasShow,
@@ -92,6 +95,7 @@ class VerificationTest : InstrumentedTest {
     )
 
     @Test
+    @Ignore("This test is failing on CI")
     fun test_aliceAndBob_sas_scan() = doTest(
             sas,
             sasScan,
@@ -100,6 +104,7 @@ class VerificationTest : InstrumentedTest {
     )
 
     @Test
+    @Ignore("This test is failing on CI")
     fun test_aliceAndBob_scan_sas() = doTest(
             sasScan,
             sas,
@@ -108,6 +113,7 @@ class VerificationTest : InstrumentedTest {
     )
 
     @Test
+    @Ignore("This test is failing on CI")
     fun test_aliceAndBob_scan_scan() = doTest(
             sasScan,
             sasScan,
@@ -116,6 +122,7 @@ class VerificationTest : InstrumentedTest {
     )
 
     @Test
+    @Ignore("This test is failing on CI")
     fun test_aliceAndBob_show_show() = doTest(
             sasShow,
             sasShow,
@@ -124,6 +131,7 @@ class VerificationTest : InstrumentedTest {
     )
 
     @Test
+    @Ignore("This test is failing on CI")
     fun test_aliceAndBob_show_scan() = doTest(
             sasShow,
             sasScan,
@@ -132,6 +140,7 @@ class VerificationTest : InstrumentedTest {
     )
 
     @Test
+    @Ignore("This test is failing on CI")
     fun test_aliceAndBob_scan_show() = doTest(
             sasScan,
             sasShow,
@@ -140,6 +149,7 @@ class VerificationTest : InstrumentedTest {
     )
 
     @Test
+    @Ignore("This test is failing on CI")
     fun test_aliceAndBob_all_all() = doTest(
             sasShowScan,
             sasShowScan,

From 012b20fca68610405359a7f17f7c90f89676d5b4 Mon Sep 17 00:00:00 2001
From: Michael Kaye <1917473+michaelkaye@users.noreply.github.com>
Date: Wed, 11 May 2022 15:54:36 +0100
Subject: [PATCH 02/12] changelog.d

---
 changelog.d/6025.misc | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/6025.misc

diff --git a/changelog.d/6025.misc b/changelog.d/6025.misc
new file mode 100644
index 0000000000..2900796792
--- /dev/null
+++ b/changelog.d/6025.misc
@@ -0,0 +1 @@
+@Ignore a number of tests that are currently failing in CI.

From 010be9184ce2677c5da963728f16530aa03d525e Mon Sep 17 00:00:00 2001
From: Michael Kaye <1917473+michaelkaye@users.noreply.github.com>
Date: Thu, 12 May 2022 15:41:22 +0100
Subject: [PATCH 03/12] Fix threading UI test failure by adding a sleep 30s.

---
 .../im/vector/app/ui/robot/ElementRobot.kt    | 20 +++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/vector/src/androidTest/java/im/vector/app/ui/robot/ElementRobot.kt b/vector/src/androidTest/java/im/vector/app/ui/robot/ElementRobot.kt
index 3c5de8b221..b9292bd916 100644
--- a/vector/src/androidTest/java/im/vector/app/ui/robot/ElementRobot.kt
+++ b/vector/src/androidTest/java/im/vector/app/ui/robot/ElementRobot.kt
@@ -120,6 +120,26 @@ class ElementRobot {
                                 .perform(ViewActions.closeSoftKeyboard(), click())
                     }
                 }
+                // at this point we are in a race with the app restarting. The steps that happen are:
+                // - (initially) app has started, app has initial synched
+                // - (restart) app has strted, app has not initial synched
+                // - (racey) app shows some UI but overlays with initial sync ui
+                // - (initial sync finishes) app has started, has initial synched
+
+                // We need to wait for the initial sync to complete; but we can't
+                // use waitForHome() like login does.
+
+		// waitForHome() -- does not work because we have already fufilled the initialSync
+                // so we can racily have an IllegalStateException that we have transitioned from busy -> idle
+                // but never having sent the signal.
+
+                // So we need to not start waiting for an initial sync until we have restarted
+                // then we do need to wait for the sync to complete.
+
+                // Which is convoluted especially as it involves the app state refreshing
+                // so; in order to make this be more stable
+                // I hereby cheat and write:
+                Thread.sleep(30_000)
             }
             else                       -> {
             }

From 78140af3f3953a29a75da6a01ade5ac71a8e1161 Mon Sep 17 00:00:00 2001
From: Michael Kaye <1917473+michaelkaye@users.noreply.github.com>
Date: Fri, 13 May 2022 15:46:05 +0100
Subject: [PATCH 04/12] Crypto tests are failing due to slow initialSync.
 Increase timeout by 60s.

---
 .../java/org/matrix/android/sdk/common/CommonTestHelper.kt      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/CommonTestHelper.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/CommonTestHelper.kt
index e33e4faea2..3ea9ad7002 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/CommonTestHelper.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/CommonTestHelper.kt
@@ -297,7 +297,7 @@ class CommonTestHelper(context: Context) {
         val session = (registrationResult as RegistrationResult.Success).session
         session.open()
         if (sessionTestParams.withInitialSync) {
-            syncSession(session, 60_000)
+            syncSession(session, 120_000)
         }
         return session
     }

From 70682b4931b22fab10fe4fd7197cd151319c5f36 Mon Sep 17 00:00:00 2001
From: Michael Kaye <1917473+michaelkaye@users.noreply.github.com>
Date: Fri, 13 May 2022 16:06:47 +0100
Subject: [PATCH 05/12] Increase timeout. Log timeout.

---
 .../java/org/matrix/android/sdk/common/CommonTestHelper.kt   | 5 ++++-
 .../java/org/matrix/android/sdk/common/TestConstants.kt      | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/CommonTestHelper.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/CommonTestHelper.kt
index 3ea9ad7002..f72c794e19 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/CommonTestHelper.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/CommonTestHelper.kt
@@ -378,7 +378,10 @@ class CommonTestHelper(context: Context) {
      * @throws InterruptedException
      */
     fun await(latch: CountDownLatch, timeout: Long? = TestConstants.timeOutMillis) {
-        assertTrue(latch.await(timeout ?: TestConstants.timeOutMillis, TimeUnit.MILLISECONDS))
+        assertTrue(
+            "Timed out after " + timeout + "ms waiting for something to happen. See stacktrace for cause.",
+	    latch.await( timeout ?: TestConstants.timeOutMillis, TimeUnit.MILLISECONDS)
+        )
     }
 
     suspend fun retryPeriodicallyWithLatch(latch: CountDownLatch, condition: (() -> Boolean)) {
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/TestConstants.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/TestConstants.kt
index 0f79896b2c..89c965c31a 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/TestConstants.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/TestConstants.kt
@@ -23,7 +23,7 @@ object TestConstants {
     const val TESTS_HOME_SERVER_URL = "http://10.0.2.2:8080"
 
     // Time out to use when waiting for server response.
-    private const val AWAIT_TIME_OUT_MILLIS = 60_000
+    private const val AWAIT_TIME_OUT_MILLIS = 120_000
 
     // Time out to use when waiting for server response, when the debugger is connected. 10 minutes
     private const val AWAIT_TIME_OUT_WITH_DEBUGGER_MILLIS = 10 * 60_000

From fa26e2a23edd45dc2d47ed88c91b67dfb6a614a3 Mon Sep 17 00:00:00 2001
From: Michael Kaye <1917473+michaelkaye@users.noreply.github.com>
Date: Fri, 13 May 2022 16:07:10 +0100
Subject: [PATCH 06/12] Revert "@Ignore all tests currently failing in CI"

This reverts commit 8d234b4b65a7a899abdeed9c5167a8c09c9af3e0.
---
 .../android/sdk/internal/crypto/E2eeSanityTests.kt     |  4 ----
 .../android/sdk/internal/crypto/PreShareKeysTest.kt    |  2 --
 .../android/sdk/internal/crypto/UnwedgingTest.kt       |  2 --
 .../sdk/internal/crypto/crosssigning/XSigningTest.kt   |  2 --
 .../sdk/internal/crypto/encryption/EncryptionTest.kt   |  3 ---
 .../sdk/internal/crypto/gossiping/KeyShareTests.kt     |  6 ------
 .../sdk/internal/crypto/gossiping/WithHeldTests.kt     |  4 ----
 .../sdk/internal/crypto/keysbackup/KeysBackupTest.kt   |  3 ---
 .../android/sdk/internal/crypto/ssss/QuadSTests.kt     |  4 ----
 .../sdk/internal/crypto/verification/SASTest.kt        |  5 -----
 .../crypto/verification/qrcode/VerificationTest.kt     | 10 ----------
 11 files changed, 45 deletions(-)

diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/E2eeSanityTests.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/E2eeSanityTests.kt
index a5749c799e..ebe4c5ff6f 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/E2eeSanityTests.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/E2eeSanityTests.kt
@@ -23,7 +23,6 @@ import org.amshove.kluent.fail
 import org.amshove.kluent.internal.assertEquals
 import org.junit.Assert
 import org.junit.FixMethodOrder
-import org.junit.Ignore
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.junit.runners.JUnit4
@@ -78,7 +77,6 @@ class E2eeSanityTests : InstrumentedTest {
      * Alice sends a new message, then check that the new one can be decrypted
      */
     @Test
-    @Ignore("This test is failing on CI")
     fun testSendingE2EEMessages() {
         val testHelper = CommonTestHelper(context())
         val cryptoTestHelper = CryptoTestHelper(testHelper)
@@ -350,7 +348,6 @@ class E2eeSanityTests : InstrumentedTest {
      * get them from an older one.
      */
     @Test
-    @Ignore("This test is failing on CI")
     fun testSimpleGossip() {
         val testHelper = CommonTestHelper(context())
         val cryptoTestHelper = CryptoTestHelper(testHelper)
@@ -456,7 +453,6 @@ class E2eeSanityTests : InstrumentedTest {
      * Test that if a better key is forwarded (lower index, it is then used)
      */
     @Test
-    @Ignore("This test is failing in CI")
     fun testForwardBetterKey() {
         val testHelper = CommonTestHelper(context())
         val cryptoTestHelper = CryptoTestHelper(testHelper)
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/PreShareKeysTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/PreShareKeysTest.kt
index 9e68673be1..93aa78a305 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/PreShareKeysTest.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/PreShareKeysTest.kt
@@ -21,7 +21,6 @@ import androidx.test.ext.junit.runners.AndroidJUnit4
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertNotNull
 import org.junit.FixMethodOrder
-import org.junit.Ignore
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.junit.runners.MethodSorters
@@ -42,7 +41,6 @@ class PreShareKeysTest : InstrumentedTest {
     private val cryptoTestHelper = CryptoTestHelper(testHelper)
 
     @Test
-    @Ignore("This test is failing on CI")
     fun ensure_outbound_session_happy_path() {
         val testData = cryptoTestHelper.doE2ETestWithAliceAndBobInARoom(true)
         val e2eRoomID = testData.roomId
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/UnwedgingTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/UnwedgingTest.kt
index 4051cedd13..0f3a4b4181 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/UnwedgingTest.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/UnwedgingTest.kt
@@ -21,7 +21,6 @@ import org.amshove.kluent.shouldBe
 import org.junit.Assert
 import org.junit.Before
 import org.junit.FixMethodOrder
-import org.junit.Ignore
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.junit.runners.MethodSorters
@@ -86,7 +85,6 @@ class UnwedgingTest : InstrumentedTest {
      * -> This is automatically fixed after SDKs restarted the olm session
      */
     @Test
-    @Ignore("This test is failing on CI")
     fun testUnwedging() {
         val cryptoTestData = cryptoTestHelper.doE2ETestWithAliceAndBobInARoom()
 
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/crosssigning/XSigningTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/crosssigning/XSigningTest.kt
index af21592799..a37626dc20 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/crosssigning/XSigningTest.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/crosssigning/XSigningTest.kt
@@ -54,7 +54,6 @@ class XSigningTest : InstrumentedTest {
     private val cryptoTestHelper = CryptoTestHelper(testHelper)
 
     @Test
-    @Ignore("This test is failing in CI")
     fun test_InitializeAndStoreKeys() {
         val aliceSession = testHelper.createAccount(TestConstants.USER_ALICE, SessionTestParams(true))
 
@@ -89,7 +88,6 @@ class XSigningTest : InstrumentedTest {
     }
 
     @Test
-    @Ignore("This test is failing in CI")
     fun test_CrossSigningCheckBobSeesTheKeys() {
         val cryptoTestData = cryptoTestHelper.doE2ETestWithAliceAndBobInARoom()
 
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/encryption/EncryptionTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/encryption/EncryptionTest.kt
index d7fa0d47e4..85b6c21df3 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/encryption/EncryptionTest.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/encryption/EncryptionTest.kt
@@ -20,7 +20,6 @@ import androidx.test.ext.junit.runners.AndroidJUnit4
 import kotlinx.coroutines.runBlocking
 import org.amshove.kluent.shouldBe
 import org.junit.FixMethodOrder
-import org.junit.Ignore
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.junit.runners.MethodSorters
@@ -47,7 +46,6 @@ class EncryptionTest : InstrumentedTest {
     private val cryptoTestHelper = CryptoTestHelper(testHelper)
 
     @Test
-    @Ignore("This test is failing in CI")
     fun test_EncryptionEvent() {
         performTest(roomShouldBeEncrypted = false) { room ->
             // Send an encryption Event as an Event (and not as a state event)
@@ -59,7 +57,6 @@ class EncryptionTest : InstrumentedTest {
     }
 
     @Test
-    @Ignore("This test is failing in CI")
     fun test_EncryptionStateEvent() {
         performTest(roomShouldBeEncrypted = true) { room ->
             runBlocking {
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/gossiping/KeyShareTests.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/gossiping/KeyShareTests.kt
index 56e1c9fbca..2e4fd62822 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/gossiping/KeyShareTests.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/gossiping/KeyShareTests.kt
@@ -26,7 +26,6 @@ import org.amshove.kluent.internal.assertEquals
 import org.junit.Assert
 import org.junit.Assert.assertNull
 import org.junit.FixMethodOrder
-import org.junit.Ignore
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.junit.runners.MethodSorters
@@ -53,7 +52,6 @@ import org.matrix.android.sdk.common.TestConstants
 class KeyShareTests : InstrumentedTest {
 
     @Test
-    @Ignore("This test is failing on CI")
     fun test_DoNotSelfShareIfNotTrusted() {
         val commonTestHelper = CommonTestHelper(context())
         val cryptoTestHelper = CryptoTestHelper(commonTestHelper)
@@ -196,7 +194,6 @@ class KeyShareTests : InstrumentedTest {
      * if the key was originally shared with him
      */
     @Test
-    @Ignore("This test is failing on CI")
     fun test_reShareIfWasIntendedToBeShared() {
         val commonTestHelper = CommonTestHelper(context())
         val cryptoTestHelper = CryptoTestHelper(commonTestHelper)
@@ -230,7 +227,6 @@ class KeyShareTests : InstrumentedTest {
      * if the key was originally shared with him
      */
     @Test
-    @Ignore("This test is failing on CI")
     fun test_reShareToUnverifiedIfWasIntendedToBeShared() {
         val commonTestHelper = CommonTestHelper(context())
         val cryptoTestHelper = CryptoTestHelper(commonTestHelper)
@@ -270,7 +266,6 @@ class KeyShareTests : InstrumentedTest {
      * Tests that keys reshared with own verified session are done from the earliest known index
      */
     @Test
-    @Ignore("This test is failing on CI")
     fun test_reShareFromTheEarliestKnownIndexWithOwnVerifiedSession() {
         val commonTestHelper = CommonTestHelper(context())
         val cryptoTestHelper = CryptoTestHelper(commonTestHelper)
@@ -393,7 +388,6 @@ class KeyShareTests : InstrumentedTest {
      * Tests that we don't cancel a request to early on first forward if the index is not good enough
      */
     @Test
-    @Ignore("This test is failing on CI")
     fun test_dontCancelToEarly() {
         val commonTestHelper = CommonTestHelper(context())
         val cryptoTestHelper = CryptoTestHelper(commonTestHelper)
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/gossiping/WithHeldTests.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/gossiping/WithHeldTests.kt
index 8464d7ca42..cb31a2232f 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/gossiping/WithHeldTests.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/gossiping/WithHeldTests.kt
@@ -21,7 +21,6 @@ import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.filters.LargeTest
 import org.junit.Assert
 import org.junit.FixMethodOrder
-import org.junit.Ignore
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.junit.runners.MethodSorters
@@ -48,7 +47,6 @@ import org.matrix.android.sdk.common.TestConstants
 class WithHeldTests : InstrumentedTest {
 
     @Test
-    @Ignore("This test is failing on CI")
     fun test_WithHeldUnverifiedReason() {
         val testHelper = CommonTestHelper(context())
         val cryptoTestHelper = CryptoTestHelper(testHelper)
@@ -154,7 +152,6 @@ class WithHeldTests : InstrumentedTest {
     }
 
     @Test
-    @Ignore("This test is failing on CI")
     fun test_WithHeldNoOlm() {
         val testHelper = CommonTestHelper(context())
         val cryptoTestHelper = CryptoTestHelper(testHelper)
@@ -238,7 +235,6 @@ class WithHeldTests : InstrumentedTest {
     }
 
     @Test
-    @Ignore("This test is failing on CI")
     fun test_WithHeldKeyRequest() {
         val testHelper = CommonTestHelper(context())
         val cryptoTestHelper = CryptoTestHelper(testHelper)
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/keysbackup/KeysBackupTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/keysbackup/KeysBackupTest.kt
index 7434598329..9136272b1e 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/keysbackup/KeysBackupTest.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/keysbackup/KeysBackupTest.kt
@@ -102,7 +102,6 @@ class KeysBackupTest : InstrumentedTest {
      * Check that prepareKeysBackupVersionWithPassword returns valid data
      */
     @Test
-    @Ignore("This test is failing on CI")
     fun prepareKeysBackupVersionTest() {
         val testHelper = CommonTestHelper(context())
 
@@ -958,7 +957,6 @@ class KeysBackupTest : InstrumentedTest {
      * -> That must fail and her backup state must be WrongBackUpVersion
      */
     @Test
-    @Ignore("This test is failing on CI")
     fun testBackupWhenAnotherBackupWasCreated() {
         val testHelper = CommonTestHelper(context())
         val cryptoTestHelper = CryptoTestHelper(testHelper)
@@ -1136,7 +1134,6 @@ class KeysBackupTest : InstrumentedTest {
      * - Delete the backup
      */
     @Test
-    @Ignore("This test is failing on CI")
     fun deleteKeysBackupTest() {
         val testHelper = CommonTestHelper(context())
         val cryptoTestHelper = CryptoTestHelper(testHelper)
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/ssss/QuadSTests.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/ssss/QuadSTests.kt
index cee8088369..c758050fc9 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/ssss/QuadSTests.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/ssss/QuadSTests.kt
@@ -55,7 +55,6 @@ class QuadSTests : InstrumentedTest {
     }
 
     @Test
-    @Ignore("This test is failing on CI")
     fun test_Generate4SKey() {
         val testHelper = CommonTestHelper(context())
 
@@ -109,7 +108,6 @@ class QuadSTests : InstrumentedTest {
     }
 
     @Test
-    @Ignore("This test is failing on CI")
     fun test_StoreSecret() {
         val testHelper = CommonTestHelper(context())
 
@@ -155,7 +153,6 @@ class QuadSTests : InstrumentedTest {
     }
 
     @Test
-    @Ignore("This test is failing on CI")
     fun test_SetDefaultLocalEcho() {
         val testHelper = CommonTestHelper(context())
 
@@ -178,7 +175,6 @@ class QuadSTests : InstrumentedTest {
     }
 
     @Test
-    @Ignore("This test is failing on CI")
     fun test_StoreSecretWithMultipleKey() {
         val testHelper = CommonTestHelper(context())
 
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/verification/SASTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/verification/SASTest.kt
index 06b912cc11..2892cf8464 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/verification/SASTest.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/verification/SASTest.kt
@@ -56,7 +56,6 @@ import java.util.concurrent.CountDownLatch
 class SASTest : InstrumentedTest {
 
     @Test
-    @Ignore("This test is failing on CI")
     fun test_aliceStartThenAliceCancel() {
         val testHelper = CommonTestHelper(context())
         val cryptoTestHelper = CryptoTestHelper(testHelper)
@@ -315,7 +314,6 @@ class SASTest : InstrumentedTest {
     // any two devices may only have at most one key verification in flight at a time.
     // If a device has two verifications in progress with the same device, then it should cancel both verifications.
     @Test
-    @Ignore("This test is failing on CI")
     fun test_aliceStartTwoRequests() {
         val testHelper = CommonTestHelper(context())
         val cryptoTestHelper = CryptoTestHelper(testHelper)
@@ -420,7 +418,6 @@ class SASTest : InstrumentedTest {
     }
 
     @Test
-    @Ignore("This test is failing on CI")
     fun test_aliceAndBobSASCode() {
         val testHelper = CommonTestHelper(context())
         val cryptoTestHelper = CryptoTestHelper(testHelper)
@@ -481,7 +478,6 @@ class SASTest : InstrumentedTest {
     }
 
     @Test
-    @Ignore("This test is failing on CI")
     fun test_happyPath() {
         val testHelper = CommonTestHelper(context())
         val cryptoTestHelper = CryptoTestHelper(testHelper)
@@ -561,7 +557,6 @@ class SASTest : InstrumentedTest {
     }
 
     @Test
-    @Ignore("This test is failing on CI")
     fun test_ConcurrentStart() {
         val testHelper = CommonTestHelper(context())
         val cryptoTestHelper = CryptoTestHelper(testHelper)
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/verification/qrcode/VerificationTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/verification/qrcode/VerificationTest.kt
index 7deeeb0ea3..df3b2ffe27 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/verification/qrcode/VerificationTest.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/verification/qrcode/VerificationTest.kt
@@ -19,7 +19,6 @@ package org.matrix.android.sdk.internal.crypto.verification.qrcode
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import org.amshove.kluent.shouldBe
 import org.junit.FixMethodOrder
-import org.junit.Ignore
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.junit.runners.MethodSorters
@@ -69,7 +68,6 @@ class VerificationTest : InstrumentedTest {
     )
 
     @Test
-    @Ignore("This test is failing on CI")
     fun test_aliceAndBob_sas_sas() = doTest(
             sas,
             sas,
@@ -78,7 +76,6 @@ class VerificationTest : InstrumentedTest {
     )
 
     @Test
-    @Ignore("This test is failing on CI")
     fun test_aliceAndBob_sas_show() = doTest(
             sas,
             sasShow,
@@ -95,7 +92,6 @@ class VerificationTest : InstrumentedTest {
     )
 
     @Test
-    @Ignore("This test is failing on CI")
     fun test_aliceAndBob_sas_scan() = doTest(
             sas,
             sasScan,
@@ -104,7 +100,6 @@ class VerificationTest : InstrumentedTest {
     )
 
     @Test
-    @Ignore("This test is failing on CI")
     fun test_aliceAndBob_scan_sas() = doTest(
             sasScan,
             sas,
@@ -113,7 +108,6 @@ class VerificationTest : InstrumentedTest {
     )
 
     @Test
-    @Ignore("This test is failing on CI")
     fun test_aliceAndBob_scan_scan() = doTest(
             sasScan,
             sasScan,
@@ -122,7 +116,6 @@ class VerificationTest : InstrumentedTest {
     )
 
     @Test
-    @Ignore("This test is failing on CI")
     fun test_aliceAndBob_show_show() = doTest(
             sasShow,
             sasShow,
@@ -131,7 +124,6 @@ class VerificationTest : InstrumentedTest {
     )
 
     @Test
-    @Ignore("This test is failing on CI")
     fun test_aliceAndBob_show_scan() = doTest(
             sasShow,
             sasScan,
@@ -140,7 +132,6 @@ class VerificationTest : InstrumentedTest {
     )
 
     @Test
-    @Ignore("This test is failing on CI")
     fun test_aliceAndBob_scan_show() = doTest(
             sasScan,
             sasShow,
@@ -149,7 +140,6 @@ class VerificationTest : InstrumentedTest {
     )
 
     @Test
-    @Ignore("This test is failing on CI")
     fun test_aliceAndBob_all_all() = doTest(
             sasShowScan,
             sasShowScan,

From 4ced6ca179e91174fdbdcbfe03fe42981d213622 Mon Sep 17 00:00:00 2001
From: Michael Kaye <1917473+michaelkaye@users.noreply.github.com>
Date: Fri, 13 May 2022 16:19:55 +0100
Subject: [PATCH 07/12] Fix linting error.

---
 .../java/org/matrix/android/sdk/common/CommonTestHelper.kt      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/CommonTestHelper.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/CommonTestHelper.kt
index f72c794e19..6678b109a6 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/CommonTestHelper.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/CommonTestHelper.kt
@@ -380,7 +380,7 @@ class CommonTestHelper(context: Context) {
     fun await(latch: CountDownLatch, timeout: Long? = TestConstants.timeOutMillis) {
         assertTrue(
             "Timed out after " + timeout + "ms waiting for something to happen. See stacktrace for cause.",
-	    latch.await( timeout ?: TestConstants.timeOutMillis, TimeUnit.MILLISECONDS)
+	    latch.await(timeout ?: TestConstants.timeOutMillis, TimeUnit.MILLISECONDS)
         )
     }
 

From 8950aa38eabac4aaf87d0ca1ffc9f6fc7166543f Mon Sep 17 00:00:00 2001
From: Michael Kaye <1917473+michaelkaye@users.noreply.github.com>
Date: Mon, 16 May 2022 15:54:28 +0100
Subject: [PATCH 08/12] Address repeated initializatin of WorkManagerImpl in
 #5887

---
 .../java/org/matrix/android/sdk/common/TestMatrix.kt     | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/TestMatrix.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/TestMatrix.kt
index e663cc1865..112753fa91 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/TestMatrix.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/TestMatrix.kt
@@ -22,6 +22,8 @@ import android.os.Looper
 import androidx.lifecycle.ProcessLifecycleOwner
 import androidx.work.Configuration
 import androidx.work.WorkManager
+import androidx.work.impl.WorkManagerImpl
+import androidx.work.impl.utils.taskexecutor.WorkManagerTaskExecutor
 import com.zhuinden.monarchy.Monarchy
 import org.matrix.android.sdk.BuildConfig
 import org.matrix.android.sdk.api.MatrixConfiguration
@@ -66,7 +68,12 @@ internal class TestMatrix(context: Context, matrixConfiguration: MatrixConfigura
                 .setExecutor(Executors.newCachedThreadPool())
                 .setWorkerFactory(matrixWorkerFactory)
                 .build()
-        WorkManager.initialize(appContext, configuration)
+        val delegate = WorkManagerImpl(
+                context,
+                configuration,
+                WorkManagerTaskExecutor(configuration.taskExecutor)
+        )
+        WorkManagerImpl.setDelegate(delegate)
         uiHandler.post {
             ProcessLifecycleOwner.get().lifecycle.addObserver(backgroundDetectionObserver)
         }

From 096cf9272aa506b32929815b301ce120a7df9808 Mon Sep 17 00:00:00 2001
From: Michael Kaye <1917473+michaelkaye@users.noreply.github.com>
Date: Mon, 16 May 2022 15:56:03 +0100
Subject: [PATCH 09/12] Rather than ignore them, put tests on a retry loop.

I'm reliably getting passing tests locally with just these ignores.
---
 .../matrix/android/sdk/internal/crypto/CryptoStoreTest.kt    | 5 +++++
 .../matrix/android/sdk/internal/crypto/E2eeSanityTests.kt    | 3 +++
 .../android/sdk/internal/crypto/gossiping/KeyShareTests.kt   | 4 ++++
 .../android/sdk/internal/crypto/gossiping/WithHeldTests.kt   | 4 ++++
 4 files changed, 16 insertions(+)

diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/CryptoStoreTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/CryptoStoreTest.kt
index e823aa39a1..6523e676be 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/CryptoStoreTest.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/CryptoStoreTest.kt
@@ -22,9 +22,11 @@ import org.junit.Assert.assertEquals
 import org.junit.Assert.assertNotEquals
 import org.junit.Assert.assertNull
 import org.junit.Before
+import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.matrix.android.sdk.InstrumentedTest
+import org.matrix.android.sdk.common.RetryTestRule
 import org.matrix.android.sdk.internal.crypto.model.OlmSessionWrapper
 import org.matrix.android.sdk.internal.crypto.store.IMXCryptoStore
 import org.matrix.android.sdk.internal.util.time.DefaultClock
@@ -37,6 +39,9 @@ private const val DUMMY_DEVICE_KEY = "DeviceKey"
 @RunWith(AndroidJUnit4::class)
 class CryptoStoreTest : InstrumentedTest {
 
+    @get:Rule var rule = RetryTestRule(3)
+
+
     private val cryptoStoreHelper = CryptoStoreHelper()
     private val clock = DefaultClock()
 
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/E2eeSanityTests.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/E2eeSanityTests.kt
index ebe4c5ff6f..077a8f407d 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/E2eeSanityTests.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/E2eeSanityTests.kt
@@ -23,6 +23,7 @@ import org.amshove.kluent.fail
 import org.amshove.kluent.internal.assertEquals
 import org.junit.Assert
 import org.junit.FixMethodOrder
+import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.junit.runners.JUnit4
@@ -57,6 +58,7 @@ import org.matrix.android.sdk.api.session.room.send.SendState
 import org.matrix.android.sdk.api.session.room.timeline.TimelineSettings
 import org.matrix.android.sdk.common.CommonTestHelper
 import org.matrix.android.sdk.common.CryptoTestHelper
+import org.matrix.android.sdk.common.RetryTestRule
 import org.matrix.android.sdk.common.SessionTestParams
 import org.matrix.android.sdk.common.TestConstants
 import org.matrix.android.sdk.common.TestMatrixCallback
@@ -67,6 +69,7 @@ import java.util.concurrent.CountDownLatch
 @LargeTest
 class E2eeSanityTests : InstrumentedTest {
 
+    @get:Rule var rule = RetryTestRule(3)
     /**
      * Simple test that create an e2ee room.
      * Some new members are added, and a message is sent.
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/gossiping/KeyShareTests.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/gossiping/KeyShareTests.kt
index 2e4fd62822..a7f2dc197a 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/gossiping/KeyShareTests.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/gossiping/KeyShareTests.kt
@@ -26,6 +26,7 @@ import org.amshove.kluent.internal.assertEquals
 import org.junit.Assert
 import org.junit.Assert.assertNull
 import org.junit.FixMethodOrder
+import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.junit.runners.MethodSorters
@@ -43,6 +44,7 @@ import org.matrix.android.sdk.api.session.room.model.create.CreateRoomParams
 import org.matrix.android.sdk.api.session.room.timeline.getLastMessageContent
 import org.matrix.android.sdk.common.CommonTestHelper
 import org.matrix.android.sdk.common.CryptoTestHelper
+import org.matrix.android.sdk.common.RetryTestRule
 import org.matrix.android.sdk.common.SessionTestParams
 import org.matrix.android.sdk.common.TestConstants
 
@@ -51,6 +53,8 @@ import org.matrix.android.sdk.common.TestConstants
 @LargeTest
 class KeyShareTests : InstrumentedTest {
 
+    @get:Rule var rule = RetryTestRule(3)
+
     @Test
     fun test_DoNotSelfShareIfNotTrusted() {
         val commonTestHelper = CommonTestHelper(context())
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/gossiping/WithHeldTests.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/gossiping/WithHeldTests.kt
index cb31a2232f..6756f403ec 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/gossiping/WithHeldTests.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/gossiping/WithHeldTests.kt
@@ -21,6 +21,7 @@ import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.filters.LargeTest
 import org.junit.Assert
 import org.junit.FixMethodOrder
+import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.junit.runners.MethodSorters
@@ -38,6 +39,7 @@ import org.matrix.android.sdk.api.session.room.getTimelineEvent
 import org.matrix.android.sdk.common.CommonTestHelper
 import org.matrix.android.sdk.common.CryptoTestHelper
 import org.matrix.android.sdk.common.MockOkHttpInterceptor
+import org.matrix.android.sdk.common.RetryTestRule
 import org.matrix.android.sdk.common.SessionTestParams
 import org.matrix.android.sdk.common.TestConstants
 
@@ -46,6 +48,8 @@ import org.matrix.android.sdk.common.TestConstants
 @LargeTest
 class WithHeldTests : InstrumentedTest {
 
+    @get:Rule var rule = RetryTestRule(3)
+
     @Test
     fun test_WithHeldUnverifiedReason() {
         val testHelper = CommonTestHelper(context())

From a19c1d6fbebaee014d59d91895919d0a6974cafa Mon Sep 17 00:00:00 2001
From: Michael Kaye <1917473+michaelkaye@users.noreply.github.com>
Date: Mon, 16 May 2022 15:56:47 +0100
Subject: [PATCH 10/12] Make test consistent wiht assert message.

---
 .../android/sdk/internal/crypto/crosssigning/XSigningTest.kt  | 1 -
 .../android/sdk/internal/crypto/gossiping/WithHeldTests.kt    | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/crosssigning/XSigningTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/crosssigning/XSigningTest.kt
index a37626dc20..ed41aeb3d7 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/crosssigning/XSigningTest.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/crosssigning/XSigningTest.kt
@@ -143,7 +143,6 @@ class XSigningTest : InstrumentedTest {
     }
 
     @Test
-    @Ignore("This test will be ignored until it is fixed")
     fun test_CrossSigningTestAliceTrustBobNewDevice() {
         val cryptoTestData = cryptoTestHelper.doE2ETestWithAliceAndBobInARoom()
 
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/gossiping/WithHeldTests.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/gossiping/WithHeldTests.kt
index 6756f403ec..dd36f9bdab 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/gossiping/WithHeldTests.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/gossiping/WithHeldTests.kt
@@ -106,7 +106,7 @@ class WithHeldTests : InstrumentedTest {
             val type = (failure as MXCryptoError.Base).errorType
             val technicalMessage = failure.technicalMessage
             Assert.assertEquals("Error should be withheld", MXCryptoError.ErrorType.KEYS_WITHHELD, type)
-            Assert.assertEquals("Cause should be unverified", WithHeldCode.UNAUTHORISED.value, technicalMessage)
+            Assert.assertEquals("Cause should be unverified", WithHeldCode.UNVERIFIED.value, technicalMessage)
         }
 
         // Let's see if the reply we got from bob first session is unverified
@@ -147,7 +147,7 @@ class WithHeldTests : InstrumentedTest {
             val type = (failure as MXCryptoError.Base).errorType
             val technicalMessage = failure.technicalMessage
             Assert.assertEquals("Error should be withheld", MXCryptoError.ErrorType.KEYS_WITHHELD, type)
-            Assert.assertEquals("Cause should be unverified", WithHeldCode.UNAUTHORISED.value, technicalMessage)
+            Assert.assertEquals("Cause should be unverified", WithHeldCode.UNVERIFIED.value, technicalMessage)
         }
 
         testHelper.signOutAndClose(aliceSession)

From 1f89cfbe44212932a1c3f8b39d859b45c21bc28f Mon Sep 17 00:00:00 2001
From: Michael Kaye <1917473+michaelkaye@users.noreply.github.com>
Date: Mon, 16 May 2022 16:46:24 +0100
Subject: [PATCH 11/12] Lint fixes

---
 .../androidTest/java/org/matrix/android/sdk/common/TestMatrix.kt | 1 -
 .../org/matrix/android/sdk/internal/crypto/CryptoStoreTest.kt    | 1 -
 .../org/matrix/android/sdk/internal/crypto/E2eeSanityTests.kt    | 1 +
 .../android/sdk/internal/crypto/crosssigning/XSigningTest.kt     | 1 -
 4 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/TestMatrix.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/TestMatrix.kt
index 112753fa91..5864a801e6 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/TestMatrix.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/TestMatrix.kt
@@ -21,7 +21,6 @@ import android.os.Handler
 import android.os.Looper
 import androidx.lifecycle.ProcessLifecycleOwner
 import androidx.work.Configuration
-import androidx.work.WorkManager
 import androidx.work.impl.WorkManagerImpl
 import androidx.work.impl.utils.taskexecutor.WorkManagerTaskExecutor
 import com.zhuinden.monarchy.Monarchy
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/CryptoStoreTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/CryptoStoreTest.kt
index 6523e676be..eaa408ef95 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/CryptoStoreTest.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/CryptoStoreTest.kt
@@ -41,7 +41,6 @@ class CryptoStoreTest : InstrumentedTest {
 
     @get:Rule var rule = RetryTestRule(3)
 
-
     private val cryptoStoreHelper = CryptoStoreHelper()
     private val clock = DefaultClock()
 
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/E2eeSanityTests.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/E2eeSanityTests.kt
index 077a8f407d..e889ebe957 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/E2eeSanityTests.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/E2eeSanityTests.kt
@@ -70,6 +70,7 @@ import java.util.concurrent.CountDownLatch
 class E2eeSanityTests : InstrumentedTest {
 
     @get:Rule var rule = RetryTestRule(3)
+
     /**
      * Simple test that create an e2ee room.
      * Some new members are added, and a message is sent.
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/crosssigning/XSigningTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/crosssigning/XSigningTest.kt
index ed41aeb3d7..abcf1714b8 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/crosssigning/XSigningTest.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/crosssigning/XSigningTest.kt
@@ -25,7 +25,6 @@ import org.junit.Assert.assertNull
 import org.junit.Assert.assertTrue
 import org.junit.Assert.fail
 import org.junit.FixMethodOrder
-import org.junit.Ignore
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.junit.runners.MethodSorters

From 868c33a8b43e6037aa4dc2649c586acc9dc47ced Mon Sep 17 00:00:00 2001
From: Michael Kaye <1917473+michaelkaye@users.noreply.github.com>
Date: Tue, 17 May 2022 12:12:49 +0100
Subject: [PATCH 12/12] Correct var -> val for @get:Rules

---
 .../org/matrix/android/sdk/internal/crypto/CryptoStoreTest.kt   | 2 +-
 .../org/matrix/android/sdk/internal/crypto/E2eeSanityTests.kt   | 2 +-
 .../android/sdk/internal/crypto/gossiping/KeyShareTests.kt      | 2 +-
 .../android/sdk/internal/crypto/gossiping/WithHeldTests.kt      | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/CryptoStoreTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/CryptoStoreTest.kt
index eaa408ef95..cd6c146f03 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/CryptoStoreTest.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/CryptoStoreTest.kt
@@ -39,7 +39,7 @@ private const val DUMMY_DEVICE_KEY = "DeviceKey"
 @RunWith(AndroidJUnit4::class)
 class CryptoStoreTest : InstrumentedTest {
 
-    @get:Rule var rule = RetryTestRule(3)
+    @get:Rule val rule = RetryTestRule(3)
 
     private val cryptoStoreHelper = CryptoStoreHelper()
     private val clock = DefaultClock()
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/E2eeSanityTests.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/E2eeSanityTests.kt
index e889ebe957..38597269cb 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/E2eeSanityTests.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/E2eeSanityTests.kt
@@ -69,7 +69,7 @@ import java.util.concurrent.CountDownLatch
 @LargeTest
 class E2eeSanityTests : InstrumentedTest {
 
-    @get:Rule var rule = RetryTestRule(3)
+    @get:Rule val rule = RetryTestRule(3)
 
     /**
      * Simple test that create an e2ee room.
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/gossiping/KeyShareTests.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/gossiping/KeyShareTests.kt
index a7f2dc197a..1bd2a46381 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/gossiping/KeyShareTests.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/gossiping/KeyShareTests.kt
@@ -53,7 +53,7 @@ import org.matrix.android.sdk.common.TestConstants
 @LargeTest
 class KeyShareTests : InstrumentedTest {
 
-    @get:Rule var rule = RetryTestRule(3)
+    @get:Rule val rule = RetryTestRule(3)
 
     @Test
     fun test_DoNotSelfShareIfNotTrusted() {
diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/gossiping/WithHeldTests.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/gossiping/WithHeldTests.kt
index dd36f9bdab..1c3c6c46e7 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/gossiping/WithHeldTests.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/gossiping/WithHeldTests.kt
@@ -48,7 +48,7 @@ import org.matrix.android.sdk.common.TestConstants
 @LargeTest
 class WithHeldTests : InstrumentedTest {
 
-    @get:Rule var rule = RetryTestRule(3)
+    @get:Rule val rule = RetryTestRule(3)
 
     @Test
     fun test_WithHeldUnverifiedReason() {