filippodb
/
SchildiChat-android
mirror of https://github.com/SchildiChat/SchildiChat-android.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

PR Remarks

This commit is contained in:
ariskotsomitopoulos 2022-01-10 11:26:03 +02:00
parent 2c8015c88f
commit 0fb26da355
3 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/RetryTestRule.kt
View File

@ -16,7 +16,6 @@
package org.matrix.android.sdk.common
import android.util.Log
import org.junit.rules.TestRule
import org.junit.runner.Description
import org.junit.runners.model.Statement
@ -27,8 +26,6 @@ import org.junit.runners.model.Statement
*/
class RetryTestRule(val retryCount: Int = 3) : TestRule {
private val TAG = RetryTestRule::class.java.simpleName
override fun apply(base: Statement, description: Description): Statement {
return statement(base, description)
}
@ -46,11 +43,8 @@ class RetryTestRule(val retryCount: Int = 3) : TestRule {
return
} catch (t: Throwable) {
caughtThrowable = t
Log.e(TAG, description.displayName + ": run " + (i + 1) + " failed")
}
}
Log.e(TAG, description.displayName + ": giving up after " + retryCount + " failures")
throw caughtThrowable!!
}
}

2
matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/common/TestConstants.kt
View File

@ -22,7 +22,7 @@ object TestConstants {
const val TESTS_HOME_SERVER_URL = "http://10.0.2.2:8080"
// Time out to use when waiting for server response. 20s
// Time out to use when waiting for server response.
private const val AWAIT_TIME_OUT_MILLIS = 30_000
// Time out to use when waiting for server response, when the debugger is connected. 10 minutes

2
matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/crypto/verification/SASTest.kt
View File

@ -546,8 +546,6 @@ class SASTest : InstrumentedTest {
val bobDeviceInfoFromAlicePOV: CryptoDeviceInfo? = aliceSession.cryptoService().getDeviceInfo(bobUserId, bobDeviceId)
val aliceDeviceInfoFromBobPOV: CryptoDeviceInfo? = bobSession.cryptoService().getDeviceInfo(aliceSession.myUserId, aliceSession.cryptoService().getMyDevice().deviceId)
// latch wait a bit again
assertTrue("alice device should be verified from bob point of view", aliceDeviceInfoFromBobPOV!!.isVerified)
assertTrue("bob device should be verified from alice point of view", bobDeviceInfoFromAlicePOV!!.isVerified)
cryptoTestData.cleanUp(testHelper)