Преглед на файлове

Repository plugin test cacheability fixes (#46572)

Mark Vieira преди 6 години
родител
ревизия
184cc4d8ed
променени са 2 файла, в които са добавени 7 реда и са изтрити 4 реда
  1. 4 2
      modules/repository-url/build.gradle
  2. 3 2
      plugins/repository-hdfs/build.gradle

+ 4 - 2
modules/repository-url/build.gradle

@@ -16,6 +16,8 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+
+import org.elasticsearch.gradle.PropertyNormalization
 import org.elasticsearch.gradle.test.AntFixture
 
 esplugin {
@@ -42,7 +44,7 @@ integTest {
 }
 testClusters.integTest {
     // repositoryDir is used by a FS repository to create snapshots
-    setting 'path.repo', "${repositoryDir.absolutePath}"
+    setting 'path.repo', "${repositoryDir.absolutePath}", PropertyNormalization.IGNORE_VALUE
     // repositoryDir is used by two URL repositories to restore snapshots
-    setting 'repositories.url.allowed_urls', { "http://snapshot.test*,http://${urlFixture.addressAndPort}" }
+    setting 'repositories.url.allowed_urls', { "http://snapshot.test*,http://${urlFixture.addressAndPort}" }, PropertyNormalization.IGNORE_VALUE
 }

+ 3 - 2
plugins/repository-hdfs/build.gradle

@@ -75,6 +75,8 @@ normalization {
     runtimeClasspath {
         // ignore generated keytab files for the purposes of build avoidance
         ignore '*.keytab'
+        // ignore fixture ports file which is on the classpath primarily to pacify the security manager
+        ignore '*HdfsFixture/**'
     }
 }
 
@@ -153,15 +155,14 @@ for (String integTestTaskName : ['integTestHa', 'integTestSecure', 'integTestSec
                   .resolve("secureHaHdfsFixture")
                   .resolve("ports")
           nonInputProperties.systemProperty "test.hdfs-fixture.ports", path
-          classpath += files(path)
         } else {
           Path path = buildDir.toPath()
                   .resolve("fixtures")
                   .resolve("haHdfsFixture")
                   .resolve("ports")
           nonInputProperties.systemProperty "test.hdfs-fixture.ports", path
-          classpath += files(path)
         }
+        classpath += files("$buildDir/fixtures")
       }
 
       if (integTestTaskName.contains("Secure")) {