浏览代码

Fix test assertion on in buildtools for windows (#66513)

Rene Groeschke 4 年之前
父节点
当前提交
09727ac411

+ 2 - 2
buildSrc/src/integTest/groovy/org/elasticsearch/gradle/internal/InternalDistributionBwcSetupPluginFuncTest.groovy

@@ -48,8 +48,8 @@ class InternalDistributionBwcSetupPluginFuncTest extends AbstractGitAwareGradleF
         result.task(":distribution:bwc:${bwcProject}:buildBwcOssDarwinTar").outcome == TaskOutcome.SUCCESS
         result.task(":distribution:bwc:${bwcProject}:buildBwcOssDarwinTar").outcome == TaskOutcome.SUCCESS
 
 
         and: "assemble task triggered"
         and: "assemble task triggered"
-        result.output.contains("[$bwcDistVersion] > Task :distribution:archives:darwin-tar:${expectedAssembleTaskName}\n")
-        result.output.contains("[$bwcDistVersion] > Task :distribution:archives:oss-darwin-tar:${expectedAssembleTaskName}\n")
+        assertOutputContains(result.output, "[$bwcDistVersion] > Task :distribution:archives:darwin-tar:${expectedAssembleTaskName}")
+        assertOutputContains(result.output, "[$bwcDistVersion] > Task :distribution:archives:oss-darwin-tar:${expectedAssembleTaskName}")
 
 
         where:
         where:
         bwcDistVersion | bwcProject | expectedAssembleTaskName
         bwcDistVersion | bwcProject | expectedAssembleTaskName