Allow disabling build api restrictions for testing legacy plugins

breskeby · Sep 18, 2023 · 40ec48b · 40ec48b
1 parent 50a031f
commit 40ec48b
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 4 deletions.
diff --git a/...org/elasticsearch/gradle/internal/test/rest/LegacyYamlRestCompatTestPluginFuncTest.groovy b/...org/elasticsearch/gradle/internal/test/rest/LegacyYamlRestCompatTestPluginFuncTest.groovy
@@ -33,9 +33,12 @@ class LegacyYamlRestCompatTestPluginFuncTest extends AbstractRestResourcesFuncTe
         // 1. TestClustersPlugin not cc compatible due to listener registration
         // 2. RestIntegTestTask not cc compatible due to
         configurationCacheCompatible = false
+        buildApiRestrictionsDisabled = true
     }
+
     def "yamlRestTestVxCompatTest does nothing when there are no tests"() {
         given:
+        println "LegacyYamlRestCompatTestPluginFuncTest.yamlRestTestVxCompatTest does nothing when there are no tests"
         subProject(":distribution:bwc:maintenance") << """
         configurations { checkout }
         artifacts {

diff --git a/...roovy/org/elasticsearch/gradle/internal/test/rest/LegacyYamlRestTestPluginFuncTest.groovy b/...roovy/org/elasticsearch/gradle/internal/test/rest/LegacyYamlRestTestPluginFuncTest.groovy
@@ -17,6 +17,11 @@ import org.gradle.testkit.runner.TaskOutcome
 @IgnoreIf({ os.isWindows() })
 class LegacyYamlRestTestPluginFuncTest extends AbstractRestResourcesFuncTest {
 
+    def setup() {
+        buildApiRestrictionsDisabled = true
+    }
+
+
     def "yamlRestTest does nothing when there are no tests"() {
         given:
         // RestIntegTestTask not cc compatible due to

diff --git a/...s/src/testFixtures/groovy/org/elasticsearch/gradle/fixtures/AbstractGradleFuncTest.groovy b/...s/src/testFixtures/groovy/org/elasticsearch/gradle/fixtures/AbstractGradleFuncTest.groovy
@@ -39,7 +39,8 @@ abstract class AbstractGradleFuncTest extends Specification {
     File propertiesFile
     File projectDir
 
-    boolean configurationCacheCompatible = true
+    protected boolean configurationCacheCompatible = true
+    protected boolean buildApiRestrictionsDisabled = false
 
     def setup() {
         projectDir = testProjectDir.root
@@ -78,6 +79,7 @@ abstract class AbstractGradleFuncTest extends Specification {
     }
 
     GradleRunner gradleRunner(File projectDir, Object... arguments) {
+        println "AbstractGradleFuncTest.gradleRunner"
         return new NormalizeOutputGradleRunner(
             new BuildConfigurationAwareGradleRunner(
                     new InternalAwareGradleRunner(
@@ -88,7 +90,8 @@ abstract class AbstractGradleFuncTest extends Specification {
                                 .withProjectDir(projectDir)
                                 .withPluginClasspath()
                                 .forwardOutput()
-            ), configurationCacheCompatible)
+            ), configurationCacheCompatible,
+                buildApiRestrictionsDisabled)
         ).withArguments(arguments.collect { it.toString() })
     }
 

diff --git a/...ures/java/org/elasticsearch/gradle/internal/test/BuildConfigurationAwareGradleRunner.java b/...ures/java/org/elasticsearch/gradle/internal/test/BuildConfigurationAwareGradleRunner.java
@@ -32,10 +32,10 @@ public class BuildConfigurationAwareGradleRunner extends GradleRunner {
     private final boolean ccCompatible;
     private final boolean buildApiRestrictionsDisabled;
 
-    public BuildConfigurationAwareGradleRunner(GradleRunner delegate, boolean ccCompatible) {
+    public BuildConfigurationAwareGradleRunner(GradleRunner delegate, boolean ccCompatible, boolean buildApiRestrictionsDisabled) {
         this.delegate = delegate;
         this.ccCompatible = ccCompatible;
-        this.buildApiRestrictionsDisabled = true;
+        this.buildApiRestrictionsDisabled = buildApiRestrictionsDisabled;
     }
 
     @Override