azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Enable execution of muted on database tests marked as FLAKY (KTI-288)

Browse Source 
It became possible to do, because all the muted flaky tests are now
synchronized with TeamCity and muted there too
This commit is contained in:
Yunir Salimzyanov
2020-07-06 19:00:35 +03:00
committed by Yunir Salimzyanov
parent 27e7116f60
commit e5bca3ce29
1 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests-common/tests/org/jetbrains/kotlin/test/muteWithDatabase.kt
+15 -6
View File
@@ -20,7 +20,7 @@ private val SKIP_MUTED_TESTS = java.lang.Boolean.getBoolean("org.jetbrains.kotli
private fun isMutedInDatabase(testClass: Class<*>, methodKey: String): Boolean {
val mutedTest = mutedSet.mutedTest(testClass, methodKey)
return mutedTest != null && (if (SKIP_MUTED_TESTS) !mutedTest.hasFailFile else mutedTest.isFlaky)
return SKIP_MUTED_TESTS && isPresentedInDatabaseWithoutFailMarker(mutedTest)
}
private fun isMutedInDatabaseWithLog(testClass: Class<*>, methodKey: String): Boolean {
@@ -49,8 +49,12 @@ internal fun wrapWithMuteInDatabase(testCase: TestCase, f: () -> Unit): (() -> U
System.err.println(mutedMessage(testClass, methodKey))
}
} else if (isPresentedInDatabaseWithoutFailMarker(mutedTest)) {
return {
invertMutedTestResultWithLog(f, testKey)
if (mutedTest?.isFlaky == true) {
return f
} else {
return {
invertMutedTestResultWithLog(f, testKey)
}
}
} else {
return wrapWithAutoMute(f, testKey)
@@ -86,9 +90,14 @@ class RunnerFactoryWithMuteInDatabase : ParametersRunnerFactory {
val methodKey = parametrizedMethodKey(method, name)
val mutedTest = getMutedTest(methodClass, methodKey) ?: getMutedTest(methodClass, method.method.name)
if (isPresentedInDatabaseWithoutFailMarker(mutedTest)) {
val testKey = testKey(methodClass, methodKey)
invertMutedTestResultWithLog({ super.evaluate() }, testKey)
return
if (mutedTest?.isFlaky == true) {
super.evaluate()
return
} else {
val testKey = testKey(methodClass, methodKey)
invertMutedTestResultWithLog({ super.evaluate() }, testKey)
return
}
}
super.evaluate()
}