Fix develop test failiures (#17)

palantir · May 4, 2021 · 7b7c34e · 7b7c34e
1 parent 671c14b
commit 7b7c34e
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/src/main/java/com/palantir/gradle/externalpublish/EnvironmentVariables.java b/src/main/java/com/palantir/gradle/externalpublish/EnvironmentVariables.java
@@ -25,6 +25,10 @@ private EnvironmentVariables() {}
     static Optional<String> envVarOrFromTestingProperty(Project project, String envVar) {
         Optional<String> fromTestingProp = Optional.ofNullable((String) project.findProperty("__TESTING_" + envVar));
 
+        if (fromTestingProp.equals(Optional.of("unset"))) {
+            return Optional.empty();
+        }
+
         if (fromTestingProp.isPresent()) {
             return fromTestingProp;
         }

diff --git a/...roovy/com/palantir/gradle/externalpublish/ExternalPublishRootPluginIntegrationSpec.groovy b/...roovy/com/palantir/gradle/externalpublish/ExternalPublishRootPluginIntegrationSpec.groovy
@@ -378,7 +378,12 @@ class ExternalPublishRootPluginIntegrationSpec extends IntegrationSpec {
         publishProject(type)
 
         when:
-        def errorMessage = runTasksWithFailure(":${type}:publish").failure.cause.cause.message
+        def errorMessage = runTasksWithFailure(
+                        ":${type}:publish",
+                        '-P__TESTING_GPG_SIGNING_KEY=unset',
+                        '-P__TESTING_GPG_SIGNING_KEY_ID=unset',
+                        '-P__TESTING_GPG_SIGNING_KEY_PASSWORD=unset',
+                ).failure.cause.cause.message
 
         then:
         errorMessage == 'The required environment variables to sign the release could not be found. ' +