Fix 3rd pary S3 tests (#40588)

alpar-t · alpar-t · commit 35d96c22c0fd · 2019-03-29T08:04:16.000+02:00
* Fix 3rd pary S3 tests

This is allready excluded on line 186, by doing this again here, the
other exclusion from arround that line are removed causing the tests to
fail.

* Fix blacklisting with the fixture
diff --git a/plugins/repository-s3/build.gradle b/plugins/repository-s3/build.gradle
@@ -177,6 +177,10 @@ if (useFixture) {
     }
     plugin file(tasks.bundlePlugin.archiveFile)
   }
+
+  integTest.runner {
+    systemProperty 'tests.rest.blacklist', 'repository_s3/50_repository_ecs_credentials/*'
+  }
 } else {
   integTest.runner {
     systemProperty 'tests.rest.blacklist',
@@ -259,10 +263,6 @@ testClusters.integTest {
   }
 }
 
-integTest.runner {
-  systemProperty 'tests.rest.blacklist', 'repository_s3/50_repository_ecs_credentials/*'
-}
-
 if (useFixture) {
   task integTestECS(type: RestIntegTestTask.class) {
     description = "Runs tests using the ECS repository."

Original file line number	Diff line number	Diff line change
`@@ -177,6 +177,10 @@ if (useFixture) {`
`177`	`177`	`}`
`178`	`178`	`plugin file(tasks.bundlePlugin.archiveFile)`
`179`	`179`	`}`
	`180`	`+`
	`181`	`+ integTest.runner {`
	`182`	`+ systemProperty 'tests.rest.blacklist', 'repository_s3/50_repository_ecs_credentials/*'`
	`183`	`+ }`
`180`	`184`	`} else {`
`181`	`185`	`integTest.runner {`
`182`	`186`	`systemProperty 'tests.rest.blacklist',`
`@@ -259,10 +263,6 @@ testClusters.integTest {`
`259`	`263`	`}`
`260`	`264`	`}`
`261`	`265`
`262`		`-integTest.runner {`
`263`		`- systemProperty 'tests.rest.blacklist', 'repository_s3/50_repository_ecs_credentials/*'`
`264`		`-}`
`265`		`-`
`266`	`266`	`if (useFixture) {`
`267`	`267`	`task integTestECS(type: RestIntegTestTask.class) {`
`268`	`268`	`description = "Runs tests using the ECS repository."`