Skip to content

Commit

Permalink
Fix failing .teamcity tests
Browse files Browse the repository at this point in the history
After introducing GitHubMergeQueueCheckPass build.
  • Loading branch information
blindpirate committed Jan 2, 2024
1 parent 7c0a8ee commit 9fc347b
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions .teamcity/src/test/kotlin/CIConfigIntegrationTests.kt
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import common.JvmVersion
import common.Os
import common.VersionedSettingsBranch
import configurations.BaseGradleBuildType
import configurations.GitHubMergeQueueCheckPass
import jetbrains.buildServer.configs.kotlin.DslContext
import jetbrains.buildServer.configs.kotlin.buildSteps.GradleBuildStep
import jetbrains.buildServer.configs.kotlin.failureConditions.BuildFailureOnText
Expand Down Expand Up @@ -41,12 +42,12 @@ class CIConfigIntegrationTests {
@Test
fun configurationTreeCanBeGenerated() {
assertEquals(rootProject.subProjects.size, model.stages.size)
assertEquals(rootProject.buildTypes.size, model.stages.size)
assertEquals(rootProject.buildTypes.size, model.stages.size + 1) // +1 for the GitHubMergeQueueCheckPass
}

@Test
fun configurationsHaveDependencies() {
val stagePassConfigs = rootProject.buildTypes
val stagePassConfigs = rootProject.buildTypes.filter { it !is GitHubMergeQueueCheckPass }
assertEquals(model.stages.size, stagePassConfigs.size)
stagePassConfigs.forEach {
val stageNumber = stagePassConfigs.indexOf(it) + 1
Expand Down

0 comments on commit 9fc347b

Please sign in to comment.