Ignore new daemon tests instead of muting them on buildserver
This commit is contained in:
+3
-1
@@ -14,8 +14,8 @@ import org.jetbrains.kotlin.cli.common.messages.MessageCollector
|
|||||||
import org.jetbrains.kotlin.cli.common.messages.OutputMessageUtil
|
import org.jetbrains.kotlin.cli.common.messages.OutputMessageUtil
|
||||||
import org.jetbrains.kotlin.cli.jvm.K2JVMCompiler
|
import org.jetbrains.kotlin.cli.jvm.K2JVMCompiler
|
||||||
import org.jetbrains.kotlin.config.Services
|
import org.jetbrains.kotlin.config.Services
|
||||||
import org.jetbrains.kotlin.daemon.client.KotlinCompilerDaemonClient
|
|
||||||
import org.jetbrains.kotlin.daemon.client.DaemonReportingTargets
|
import org.jetbrains.kotlin.daemon.client.DaemonReportingTargets
|
||||||
|
import org.jetbrains.kotlin.daemon.client.KotlinCompilerDaemonClient
|
||||||
import org.jetbrains.kotlin.daemon.common.*
|
import org.jetbrains.kotlin.daemon.common.*
|
||||||
import org.jetbrains.kotlin.daemon.common.ReportSeverity
|
import org.jetbrains.kotlin.daemon.common.ReportSeverity
|
||||||
import org.jetbrains.kotlin.daemon.loggerCompatiblePath
|
import org.jetbrains.kotlin.daemon.loggerCompatiblePath
|
||||||
@@ -24,6 +24,7 @@ import org.jetbrains.kotlin.scripts.captureOut
|
|||||||
import org.jetbrains.kotlin.test.KotlinTestUtils
|
import org.jetbrains.kotlin.test.KotlinTestUtils
|
||||||
import org.jetbrains.kotlin.test.testFramework.KtUsefulTestCase
|
import org.jetbrains.kotlin.test.testFramework.KtUsefulTestCase
|
||||||
import org.junit.Assert
|
import org.junit.Assert
|
||||||
|
import org.junit.Ignore
|
||||||
import java.io.File
|
import java.io.File
|
||||||
import java.net.URLClassLoader
|
import java.net.URLClassLoader
|
||||||
import java.util.logging.LogManager
|
import java.util.logging.LogManager
|
||||||
@@ -33,6 +34,7 @@ private val logFiles = arrayListOf<String>()
|
|||||||
|
|
||||||
// TODO: remove ignore annotation from tests.
|
// TODO: remove ignore annotation from tests.
|
||||||
|
|
||||||
|
@Ignore
|
||||||
class CompilerApiTest : KotlinIntegrationTestBase() {
|
class CompilerApiTest : KotlinIntegrationTestBase() {
|
||||||
|
|
||||||
val kotlinCompilerClient = KotlinCompilerDaemonClient
|
val kotlinCompilerClient = KotlinCompilerDaemonClient
|
||||||
|
|||||||
+6
-3
@@ -19,10 +19,14 @@ import org.jetbrains.kotlin.daemon.*
|
|||||||
import org.jetbrains.kotlin.daemon.client.DaemonReportingTargets
|
import org.jetbrains.kotlin.daemon.client.DaemonReportingTargets
|
||||||
import org.jetbrains.kotlin.daemon.client.KotlinCompilerClientInstance
|
import org.jetbrains.kotlin.daemon.client.KotlinCompilerClientInstance
|
||||||
import org.jetbrains.kotlin.daemon.client.KotlinCompilerDaemonClient
|
import org.jetbrains.kotlin.daemon.client.KotlinCompilerDaemonClient
|
||||||
|
import org.jetbrains.kotlin.daemon.client.experimental.CompilerCallbackServicesFacadeServerServerSide
|
||||||
|
import org.jetbrains.kotlin.daemon.client.experimental.KotlinRemoteReplCompilerClientAsync
|
||||||
import org.jetbrains.kotlin.daemon.common.*
|
import org.jetbrains.kotlin.daemon.common.*
|
||||||
|
import org.jetbrains.kotlin.daemon.common.experimental.findCallbackServerSocket
|
||||||
import org.jetbrains.kotlin.integration.KotlinIntegrationTestBase
|
import org.jetbrains.kotlin.integration.KotlinIntegrationTestBase
|
||||||
import org.jetbrains.kotlin.progress.experimental.CompilationCanceledStatus
|
import org.jetbrains.kotlin.progress.experimental.CompilationCanceledStatus
|
||||||
import org.jetbrains.kotlin.test.KotlinTestUtils
|
import org.jetbrains.kotlin.test.KotlinTestUtils
|
||||||
|
import org.jetbrains.kotlin.utils.KotlinPaths
|
||||||
import java.io.ByteArrayOutputStream
|
import java.io.ByteArrayOutputStream
|
||||||
import java.io.File
|
import java.io.File
|
||||||
import java.io.IOException
|
import java.io.IOException
|
||||||
@@ -47,15 +51,14 @@ import kotlin.script.experimental.dependencies.DependenciesResolver.ResolveResul
|
|||||||
import kotlin.script.experimental.dependencies.ScriptDependencies
|
import kotlin.script.experimental.dependencies.ScriptDependencies
|
||||||
import kotlin.script.experimental.dependencies.asSuccess
|
import kotlin.script.experimental.dependencies.asSuccess
|
||||||
import kotlin.script.templates.ScriptTemplateDefinition
|
import kotlin.script.templates.ScriptTemplateDefinition
|
||||||
|
import kotlin.test.Ignore
|
||||||
import kotlin.test.fail
|
import kotlin.test.fail
|
||||||
import org.jetbrains.kotlin.daemon.client.experimental.*
|
|
||||||
import org.jetbrains.kotlin.daemon.common.experimental.*
|
|
||||||
import org.jetbrains.kotlin.utils.KotlinPaths
|
|
||||||
|
|
||||||
val TIMEOUT_DAEMON_RUNNER_EXIT_MS = 10000L
|
val TIMEOUT_DAEMON_RUNNER_EXIT_MS = 10000L
|
||||||
|
|
||||||
// TODO: remove ignore annotation from tests.
|
// TODO: remove ignore annotation from tests.
|
||||||
|
|
||||||
|
@Ignore
|
||||||
class CompilerDaemonTest : KotlinIntegrationTestBase() {
|
class CompilerDaemonTest : KotlinIntegrationTestBase() {
|
||||||
|
|
||||||
val kotlinCompilerClientInstance = KotlinCompilerDaemonClient.instantiate(DaemonProtocolVariant.SOCKETS)
|
val kotlinCompilerClientInstance = KotlinCompilerDaemonClient.instantiate(DaemonProtocolVariant.SOCKETS)
|
||||||
|
|||||||
+5
-3
@@ -5,10 +5,10 @@
|
|||||||
|
|
||||||
package org.jetbrains.kotlin.daemon.experimental.unit
|
package org.jetbrains.kotlin.daemon.experimental.unit
|
||||||
|
|
||||||
import io.ktor.network.selector.ActorSelectorManager
|
|
||||||
import io.ktor.network.selector.SelectorManager
|
|
||||||
import io.ktor.network.sockets.aSocket
|
import io.ktor.network.sockets.aSocket
|
||||||
import kotlinx.coroutines.*
|
import kotlinx.coroutines.GlobalScope
|
||||||
|
import kotlinx.coroutines.async
|
||||||
|
import kotlinx.coroutines.runBlocking
|
||||||
import org.jetbrains.kotlin.daemon.common.experimental.CompilerServicesFacadeBaseClientSideImpl
|
import org.jetbrains.kotlin.daemon.common.experimental.CompilerServicesFacadeBaseClientSideImpl
|
||||||
import org.jetbrains.kotlin.daemon.common.experimental.LoopbackNetworkInterfaceKtor.selectorMgr
|
import org.jetbrains.kotlin.daemon.common.experimental.LoopbackNetworkInterfaceKtor.selectorMgr
|
||||||
import org.jetbrains.kotlin.daemon.common.experimental.socketInfrastructure.DefaultClient
|
import org.jetbrains.kotlin.daemon.common.experimental.socketInfrastructure.DefaultClient
|
||||||
@@ -17,6 +17,7 @@ import org.jetbrains.kotlin.daemon.common.experimental.socketInfrastructure.open
|
|||||||
import org.jetbrains.kotlin.daemon.common.experimental.socketInfrastructure.runWithTimeout
|
import org.jetbrains.kotlin.daemon.common.experimental.socketInfrastructure.runWithTimeout
|
||||||
import org.jetbrains.kotlin.daemon.common.toRMI
|
import org.jetbrains.kotlin.daemon.common.toRMI
|
||||||
import org.jetbrains.kotlin.integration.KotlinIntegrationTestBase
|
import org.jetbrains.kotlin.integration.KotlinIntegrationTestBase
|
||||||
|
import org.junit.Ignore
|
||||||
import java.io.ObjectInputStream
|
import java.io.ObjectInputStream
|
||||||
import java.io.ObjectOutputStream
|
import java.io.ObjectOutputStream
|
||||||
import java.net.InetSocketAddress
|
import java.net.InetSocketAddress
|
||||||
@@ -38,6 +39,7 @@ class TestServer(val serverPort: Int = 6999) {
|
|||||||
|
|
||||||
val testServer = TestServer()
|
val testServer = TestServer()
|
||||||
|
|
||||||
|
@Ignore
|
||||||
@Suppress("UNCHECKED_CAST")
|
@Suppress("UNCHECKED_CAST")
|
||||||
class ClientSerializationTest : KotlinIntegrationTestBase() {
|
class ClientSerializationTest : KotlinIntegrationTestBase() {
|
||||||
|
|
||||||
|
|||||||
@@ -17,11 +17,15 @@ import org.jetbrains.kotlin.daemon.CompilerSelector
|
|||||||
import org.jetbrains.kotlin.daemon.client.KotlinCompilerDaemonClient
|
import org.jetbrains.kotlin.daemon.client.KotlinCompilerDaemonClient
|
||||||
import org.jetbrains.kotlin.daemon.client.experimental.BasicCompilerServicesWithResultsFacadeServerServerSide
|
import org.jetbrains.kotlin.daemon.client.experimental.BasicCompilerServicesWithResultsFacadeServerServerSide
|
||||||
import org.jetbrains.kotlin.daemon.common.*
|
import org.jetbrains.kotlin.daemon.common.*
|
||||||
import org.jetbrains.kotlin.daemon.common.experimental.*
|
import org.jetbrains.kotlin.daemon.common.experimental.DaemonWithMetadataAsync
|
||||||
|
import org.jetbrains.kotlin.daemon.common.experimental.findCallbackServerSocket
|
||||||
|
import org.jetbrains.kotlin.daemon.common.experimental.findPortForSocket
|
||||||
|
import org.jetbrains.kotlin.daemon.common.experimental.walkDaemonsAsync
|
||||||
import org.jetbrains.kotlin.daemon.experimental.CompileServiceServerSideImpl
|
import org.jetbrains.kotlin.daemon.experimental.CompileServiceServerSideImpl
|
||||||
import org.jetbrains.kotlin.daemon.loggerCompatiblePath
|
import org.jetbrains.kotlin.daemon.loggerCompatiblePath
|
||||||
import org.jetbrains.kotlin.integration.KotlinIntegrationTestBase
|
import org.jetbrains.kotlin.integration.KotlinIntegrationTestBase
|
||||||
import org.jetbrains.kotlin.test.KotlinTestUtils
|
import org.jetbrains.kotlin.test.KotlinTestUtils
|
||||||
|
import org.junit.Ignore
|
||||||
import java.io.ByteArrayOutputStream
|
import java.io.ByteArrayOutputStream
|
||||||
import java.io.File
|
import java.io.File
|
||||||
import java.io.IOException
|
import java.io.IOException
|
||||||
@@ -31,6 +35,7 @@ import java.util.logging.LogManager
|
|||||||
import java.util.logging.Logger
|
import java.util.logging.Logger
|
||||||
import kotlin.concurrent.schedule
|
import kotlin.concurrent.schedule
|
||||||
|
|
||||||
|
@Ignore
|
||||||
class ConnectionsTest : KotlinIntegrationTestBase() {
|
class ConnectionsTest : KotlinIntegrationTestBase() {
|
||||||
|
|
||||||
val kotlinCompilerClient = KotlinCompilerDaemonClient.instantiate(DaemonProtocolVariant.SOCKETS)
|
val kotlinCompilerClient = KotlinCompilerDaemonClient.instantiate(DaemonProtocolVariant.SOCKETS)
|
||||||
|
|||||||
Reference in New Issue
Block a user