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] 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,