Merge remote-tracking branch 'fork_github/issue_10467' into issue_10467

yongyiduan · Jun 4, 2024 · 8cda4d2 · 8cda4d2
2 parents c8d0020 + 6f0e875
commit 8cda4d2
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/...ss/biz-base/src/test/kotlin/com/tencent/devops/process/engine/control/ControlUtilsTest.kt b/...ss/biz-base/src/test/kotlin/com/tencent/devops/process/engine/control/ControlUtilsTest.kt
@@ -27,7 +27,6 @@
 
 package com.tencent.devops.process.engine.control
 
-import com.tencent.devops.common.expression.ExpressionParseException
 import com.tencent.devops.common.pipeline.NameAndValue
 import com.tencent.devops.common.pipeline.enums.BuildStatus
 import com.tencent.devops.common.pipeline.enums.JobRunCondition
@@ -45,7 +44,6 @@ import io.mockk.mockkObject
 import org.junit.jupiter.api.Assertions
 import org.junit.jupiter.api.BeforeEach
 import org.junit.jupiter.api.Test
-import org.junit.jupiter.api.assertThrows
 
 /**
  * @version 1.0
@@ -176,15 +174,15 @@ class ControlUtilsTest : TestBase() {
                 customCondition = "true==true"
             )
         )
-        assertThrows<ExpressionParseException> {
+        Assertions.assertTrue(
             ControlUtils.checkJobSkipCondition(
                 conditions = conditions,
                 variables = variables,
                 buildId = buildId,
                 runCondition = JobRunCondition.CUSTOM_CONDITION_MATCH,
                 customCondition = "a==a"
             )
-        }
+        )
     }
 
     @Test