From a5a95995e1c5483379d09d6c1c157fef8eeb7bf4 Mon Sep 17 00:00:00 2001
From: valere <valeref@matrix.org>
Date: Wed, 5 Apr 2023 16:37:36 +0200
Subject: [PATCH] test flakiness

---
 .../crypto/E2eeShareKeysHistoryTest.kt        | 25 +++++++++----------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/E2eeShareKeysHistoryTest.kt b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/E2eeShareKeysHistoryTest.kt
index f6112d7a46..380bec9def 100644
--- a/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/E2eeShareKeysHistoryTest.kt
+++ b/matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/E2eeShareKeysHistoryTest.kt
@@ -116,10 +116,10 @@ class E2eeShareKeysHistoryTest : InstrumentedTest {
                             timelineEvent.root.getClearType() == EventType.MESSAGE
                             // && timelineEvent.root.mxDecryptionResult?.verificationState == MessageVerificationState.UN_SIGNED_DEVICE
                             ).also {
-                        if (it) {
-                            Log.v("#E2E TEST", "Bob can decrypt the message: ${timelineEvent?.root?.getDecryptedTextSummary()}")
-                        }
-                    }
+                                if (it) {
+                                    Log.v("#E2E TEST", "Bob can decrypt the message: ${timelineEvent?.root?.getDecryptedTextSummary()}")
+                                }
+                            }
                 }
 
                 // Create a new user
@@ -386,7 +386,8 @@ class E2eeShareKeysHistoryTest : InstrumentedTest {
                 }
             }
         }
-
+        Log.v("#E2E TEST ROTATION", "second session id $secondAliceMessageSessionId")
+        Log.v("#E2E TEST ROTATION", "third session id $aliceThirdMessageSessionId")
         when {
             initRoomHistoryVisibility.shouldShareHistory() == nextRoomHistoryVisibility.historyVisibility?.shouldShareHistory() -> {
                 assertEquals("Session shouldn't have been rotated", secondAliceMessageSessionId, aliceThirdMessageSessionId)
@@ -397,8 +398,6 @@ class E2eeShareKeysHistoryTest : InstrumentedTest {
                 Log.v("#E2E TEST ROTATION", "Rotation is needed!")
             }
         }
-
-        cryptoTestData.cleanUp(testHelper)
     }
 
     private suspend fun sendMessageInRoom(aliceRoomPOV: Room, text: String, testHelper: CommonTestHelper): String? {
@@ -428,12 +427,12 @@ class E2eeShareKeysHistoryTest : InstrumentedTest {
             }
         }
 
-            Log.v("#E2E TEST", "${otherSession.myUserId} tries to join room $e2eRoomID")
-            try {
-                otherSession.roomService().joinRoom(e2eRoomID)
-            } catch (ex: JoinRoomFailure.JoinedWithTimeout) {
-                // it's ok we will wait after
-            }
+        Log.v("#E2E TEST", "${otherSession.myUserId} tries to join room $e2eRoomID")
+        try {
+            otherSession.roomService().joinRoom(e2eRoomID)
+        } catch (ex: JoinRoomFailure.JoinedWithTimeout) {
+            // it's ok we will wait after
+        }
 
         Log.v("#E2E TEST", "${otherSession.myUserId} waiting for join echo ...")
         testHelper.retryWithBackoff {