Disable v2 integration tests for now (#17813)

* disable v2 integration tests

* remove unused import
This commit is contained in:
Paul Brauner 2023-11-14 13:08:22 +01:00 committed by GitHub
parent 890dee12bf
commit 751423d5a7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 48 additions and 15 deletions

View File

@ -17,7 +17,10 @@ import scala.concurrent.Future
import scala.util.{Failure, Success}
class AuthITV1 extends AuthIT(LanguageMajorVersion.V1)
class AuthITV2 extends AuthIT(LanguageMajorVersion.V2)
// TODO(https://github.com/digital-asset/daml/issues/17812): re-enable this test and control its run
// at the bazel target level.
//class AuthITV2 extends AuthIT(LanguageMajorVersion.V2)
class AuthIT(override val majorLanguageVersion: LanguageMajorVersion)
extends AsyncWordSpec

View File

@ -8,7 +8,7 @@ import com.daml.bazeltools.BazelRunfiles
import com.daml.lf.data.Ref._
import com.daml.lf.engine.script.ScriptTimeMode
import com.daml.lf.language.LanguageMajorVersion
import com.daml.lf.language.LanguageMajorVersion.{V1, V2}
import com.daml.lf.language.LanguageMajorVersion.V1
import com.daml.lf.speedy.SValue._
import java.nio.file.Paths
@ -19,7 +19,10 @@ import org.scalatest.wordspec.AsyncWordSpec
// TODO(#17366): Once daml3-script diverges from script, V1DevIT and V2DevIT may not be able to
// share the same code anymore.
class DevITV1 extends DevIT(V1)
class DevITV2 extends DevIT(V2)
// TODO(https://github.com/digital-asset/daml/issues/17812): re-enable this test and control its run
// at the bazel target level.
//class DevITV2 extends DevIT(V2)
class DevIT(override val majorLanguageVersion: LanguageMajorVersion)
extends AsyncWordSpec

View File

@ -10,7 +10,10 @@ import com.daml.lf.language.LanguageMajorVersion
import com.daml.lf.speedy.SValue.SRecord
class FuncStaticTimeITV1 extends FuncStaticTimeIT(LanguageMajorVersion.V1)
class FuncStaticTimeITV2 extends FuncStaticTimeIT(LanguageMajorVersion.V2)
// TODO(https://github.com/digital-asset/daml/issues/17812): re-enable this test and control its run
// at the bazel target level.
//class FuncStaticTimeITV2 extends FuncStaticTimeIT(LanguageMajorVersion.V2)
class FuncStaticTimeIT(override val majorLanguageVersion: LanguageMajorVersion)
extends AbstractFuncIT {

View File

@ -10,7 +10,10 @@ import com.daml.lf.language.LanguageMajorVersion
import com.daml.lf.speedy.SValue.SRecord
class FuncWallClockITV1 extends FuncWallClockIT(LanguageMajorVersion.V1)
class FuncWallClockITV2 extends FuncWallClockIT(LanguageMajorVersion.V2)
// TODO(https://github.com/digital-asset/daml/issues/17812): re-enable this test and control its run
// at the bazel target level.
//class FuncWallClockITV2 extends FuncWallClockIT(LanguageMajorVersion.V2)
class FuncWallClockIT(override val majorLanguageVersion: LanguageMajorVersion)
extends AbstractFuncIT {

View File

@ -14,7 +14,10 @@ import org.scalatest.matchers.should.Matchers
import org.scalatest.wordspec.AsyncWordSpec
class MultiParticipantITV1 extends MultiParticipantIT(LanguageMajorVersion.V1)
class MultiParticipantITV2 extends MultiParticipantIT(LanguageMajorVersion.V2)
// TODO(https://github.com/digital-asset/daml/issues/17812): re-enable this test and control its run
// at the bazel target level.
//class MultiParticipantITV2 extends MultiParticipantIT(LanguageMajorVersion.V2)
class MultiParticipantIT(override val majorLanguageVersion: LanguageMajorVersion)
extends AsyncWordSpec

View File

@ -11,7 +11,10 @@ import org.scalatest.matchers.should.Matchers
import org.scalatest.wordspec.AsyncWordSpec
class TlsITV1 extends TlsIT(LanguageMajorVersion.V1)
class TlsITV2 extends TlsIT(LanguageMajorVersion.V2)
// TODO(https://github.com/digital-asset/daml/issues/17812): re-enable this test and control its run
// at the bazel target level.
//class TlsITV2 extends TlsIT(LanguageMajorVersion.V2)
class TlsIT(override val majorLanguageVersion: LanguageMajorVersion)
extends AsyncWordSpec

View File

@ -7,8 +7,11 @@ import com.daml.lf.language.LanguageMajorVersion
class TriggerServiceTestAuthWithOracleV1
extends TriggerServiceTestAuthWithOracle(LanguageMajorVersion.V1)
class TriggerServiceTestAuthWithOracleV2
extends TriggerServiceTestAuthWithOracle(LanguageMajorVersion.V2)
// TODO(https://github.com/digital-asset/daml/issues/17812): re-enable this test and control its run
// at the bazel target level.
//class TriggerServiceTestAuthWithOracleV2
// extends TriggerServiceTestAuthWithOracle(LanguageMajorVersion.V2)
class TriggerServiceTestAuthWithOracle(override val majorLanguageVersion: LanguageMajorVersion)
extends AbstractTriggerServiceTest
@ -19,8 +22,11 @@ class TriggerServiceTestAuthWithOracle(override val majorLanguageVersion: Langua
class TriggerServiceTestAuthWithOracleClaimsV1
extends TriggerServiceTestAuthWithOracleClaims(LanguageMajorVersion.V1)
class TriggerServiceTestAuthWithOracleClaimsV2
extends TriggerServiceTestAuthWithOracleClaims(LanguageMajorVersion.V2)
// TODO(https://github.com/digital-asset/daml/issues/17812): re-enable this test and control its run
// at the bazel target level.
//class TriggerServiceTestAuthWithOracleClaimsV2
// extends TriggerServiceTestAuthWithOracleClaims(LanguageMajorVersion.V2)
class TriggerServiceTestAuthWithOracleClaims(
override val majorLanguageVersion: LanguageMajorVersion

View File

@ -6,7 +6,10 @@ package com.daml.lf.engine.trigger
import com.daml.lf.language.LanguageMajorVersion
class TriggerServiceTestAuthWithPostgresV1 extends TriggerServiceTestAuthWithPostgres(LanguageMajorVersion.V1)
class TriggerServiceTestAuthWithPostgresV2 extends TriggerServiceTestAuthWithPostgres(LanguageMajorVersion.V2)
// TODO(https://github.com/digital-asset/daml/issues/17812): re-enable this test and control its run
// at the bazel target level.
//class TriggerServiceTestAuthWithPostgresV2 extends TriggerServiceTestAuthWithPostgres(LanguageMajorVersion.V2)
class TriggerServiceTestAuthWithPostgres(override val majorLanguageVersion: LanguageMajorVersion)
extends AbstractTriggerServiceTest

View File

@ -6,7 +6,10 @@ package com.daml.lf.engine.trigger
import com.daml.lf.language.LanguageMajorVersion
class TriggerServiceTestWithOracleV1 extends TriggerServiceTestWithOracle(LanguageMajorVersion.V1)
class TriggerServiceTestWithOracleV2 extends TriggerServiceTestWithOracle(LanguageMajorVersion.V2)
// TODO(https://github.com/digital-asset/daml/issues/17812): re-enable this test and control its run
// at the bazel target level.
//class TriggerServiceTestWithOracleV2 extends TriggerServiceTestWithOracle(LanguageMajorVersion.V2)
class TriggerServiceTestWithOracle(override val majorLanguageVersion: LanguageMajorVersion)
extends AbstractTriggerServiceTest

View File

@ -7,8 +7,11 @@ import com.daml.lf.language.LanguageMajorVersion
class TriggerServiceTestWithPostgresV1
extends TriggerServiceTestWithPostgres(LanguageMajorVersion.V1)
class TriggerServiceTestWithPostgresV2
extends TriggerServiceTestWithPostgres(LanguageMajorVersion.V2)
// TODO(https://github.com/digital-asset/daml/issues/17812): re-enable this test and control its run
// at the bazel target level.
//class TriggerServiceTestWithPostgresV2
// extends TriggerServiceTestWithPostgres(LanguageMajorVersion.V2)
class TriggerServiceTestWithPostgres(override val majorLanguageVersion: LanguageMajorVersion)
extends AbstractTriggerServiceTest