Skip to content

Commit 6f67613

Browse files
committed
Fix parallel test execution
1 parent ab67fe7 commit 6f67613

File tree

4 files changed

+27
-0
lines changed

4 files changed

+27
-0
lines changed

api-client/src/main/java/de/gesellix/docker/authentication/AuthConfig.java

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,4 +90,17 @@ public boolean equals(Object o) {
9090
public int hashCode() {
9191
return Objects.hash(username, password, auth, email, serveraddress, identitytoken, registrytoken);
9292
}
93+
94+
@Override
95+
public String toString() {
96+
return "AuthConfig{" +
97+
"username='" + username + '\'' +
98+
", password=_redacted_'" + '\'' +
99+
", auth=_redacted_'" + '\'' +
100+
", email='" + email + '\'' +
101+
", serveraddress='" + serveraddress + '\'' +
102+
", identitytoken=_redacted_'" + '\'' +
103+
", registrytoken=_redacted_'" + '\'' +
104+
'}';
105+
}
93106
}

api-client/src/main/java/de/gesellix/docker/engine/DockerConfigReader.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
package de.gesellix.docker.engine;
22

33
import com.squareup.moshi.Moshi;
4+
45
import okio.Okio;
6+
57
import org.slf4j.Logger;
68
import org.slf4j.LoggerFactory;
79

api-client/src/test/groovy/de/gesellix/docker/authentication/AuthConfigReaderTest.groovy

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,8 @@ class AuthConfigReaderTest extends Specification {
3838
cleanup:
3939
if (oldDockerConfig) {
4040
System.setProperty("docker.config", oldDockerConfig)
41+
} else {
42+
System.clearProperty("docker.config")
4143
}
4244
}
4345

@@ -59,6 +61,8 @@ class AuthConfigReaderTest extends Specification {
5961
cleanup:
6062
if (oldDockerConfig) {
6163
System.setProperty("docker.config", oldDockerConfig)
64+
} else {
65+
System.clearProperty("docker.config")
6266
}
6367
}
6468

@@ -141,6 +145,8 @@ class AuthConfigReaderTest extends Specification {
141145
cleanup:
142146
if (oldDockerConfig) {
143147
System.setProperty("docker.config", oldDockerConfig)
148+
} else {
149+
System.clearProperty("docker.config")
144150
}
145151
}
146152

@@ -165,6 +171,8 @@ class AuthConfigReaderTest extends Specification {
165171
cleanup:
166172
if (oldDockerConfig) {
167173
System.setProperty("docker.config", oldDockerConfig)
174+
} else {
175+
System.clearProperty("docker.config")
168176
}
169177
}
170178
}

api-client/src/test/groovy/de/gesellix/docker/engine/DockerEnvTest.groovy

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,8 @@ class DockerEnvTest extends Specification {
4040
cleanup:
4141
if (oldDockerConfigDir) {
4242
System.setProperty("docker.config", oldDockerConfigDir)
43+
} else {
44+
System.clearProperty("docker.config")
4345
}
4446
}
4547

@@ -66,6 +68,8 @@ class DockerEnvTest extends Specification {
6668
cleanup:
6769
if (oldDockerConfig) {
6870
System.setProperty("docker.config", oldDockerConfig)
71+
} else {
72+
System.clearProperty("docker.config")
6973
}
7074
}
7175
}

0 commit comments

Comments
 (0)