Skip to content

Commit 8462173

Browse files
author
Marcus Linke
committed
Disable test cleanup exceptions stacktraces
1 parent 1098c29 commit 8462173

2 files changed

Lines changed: 43 additions & 44 deletions

File tree

‎src/test/java/com/github/dockerjava/client/AbstractDockerClientTest.java‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,7 @@ public abstract class AbstractDockerClientTest extends Assert {
3939
protected TestDockerCmdExecFactory dockerCmdExecFactory = new TestDockerCmdExecFactory(DockerClientBuilder.getDefaultDockerCmdExecFactory());
4040

4141
public void beforeTest() {
42-
43-
42+
4443
LOG.info("======================= BEFORETEST =======================");
4544
LOG.info("Connecting to Docker server");
4645
dockerClient = DockerClientBuilder.getInstance(config())
@@ -51,8 +50,6 @@ public void beforeTest() {
5150
// need to block until image is pulled completely
5251
asString(dockerClient.pullImageCmd("busybox").withTag("latest").exec());
5352

54-
55-
5653
assertNotNull(dockerClient);
5754
LOG.info("======================= END OF BEFORETEST =======================\n\n");
5855
}
@@ -90,7 +87,7 @@ public void afterMethod(ITestResult result) {
9087
try {
9188
dockerClient.removeContainerCmd(container).withForce().exec();
9289
} catch (DockerException ignore) {
93-
ignore.printStackTrace();
90+
//ignore.printStackTrace();
9491
}
9592
}
9693

@@ -99,7 +96,7 @@ public void afterMethod(ITestResult result) {
9996
try {
10097
dockerClient.removeImageCmd(image).withForce().exec();
10198
} catch (DockerException ignore) {
102-
ignore.printStackTrace();
99+
//ignore.printStackTrace();
103100
}
104101
}
105102

‎src/test/java/com/github/dockerjava/core/TestDockerCmdExecFactory.java‎

Lines changed: 40 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -11,24 +11,25 @@
1111
import com.github.dockerjava.jaxrs.BuildImageCmdExec;
1212

1313
/**
14-
* Special {@link DockerCmdExecFactory} implementation that collects container and image creations
15-
* while test execution for the purpose of automatically cleanup.
14+
* Special {@link DockerCmdExecFactory} implementation that collects container
15+
* and image creations while test execution for the purpose of automatically
16+
* cleanup.
1617
*
1718
* @author marcus
18-
*
19+
*
1920
*/
2021
public class TestDockerCmdExecFactory implements DockerCmdExecFactory {
21-
22+
2223
private List<String> containerNames = new ArrayList<String>();
23-
24+
2425
private List<String> imageNames = new ArrayList<String>();
25-
26+
2627
private DockerCmdExecFactory delegate;
27-
28+
2829
public TestDockerCmdExecFactory(DockerCmdExecFactory delegate) {
2930
this.delegate = delegate;
3031
}
31-
32+
3233
@Override
3334
public void init(DockerClientConfig dockerClientConfig) {
3435
delegate.init(dockerClientConfig);
@@ -38,19 +39,20 @@ public void init(DockerClientConfig dockerClientConfig) {
3839
public void close() throws IOException {
3940
delegate.close();
4041
}
41-
42+
4243
@Override
4344
public CreateContainerCmd.Exec createCreateContainerCmdExec() {
4445
return new CreateContainerCmd.Exec() {
4546
@Override
4647
public CreateContainerResponse exec(CreateContainerCmd command) {
47-
CreateContainerResponse createContainerResponse = delegate.createCreateContainerCmdExec().exec(command);
48+
CreateContainerResponse createContainerResponse = delegate
49+
.createCreateContainerCmdExec().exec(command);
4850
containerNames.add(createContainerResponse.getId());
4951
return createContainerResponse;
5052
}
5153
};
5254
}
53-
55+
5456
@Override
5557
public RemoveContainerCmd.Exec createRemoveContainerCmdExec() {
5658
return new RemoveContainerCmd.Exec() {
@@ -62,21 +64,20 @@ public Void exec(RemoveContainerCmd command) {
6264
}
6365
};
6466
}
65-
67+
6668
@Override
6769
public CreateImageCmd.Exec createCreateImageCmdExec() {
6870
return new CreateImageCmd.Exec() {
6971
@Override
7072
public CreateImageResponse exec(CreateImageCmd command) {
71-
CreateImageResponse createImageResponse = delegate.createCreateImageCmdExec().exec(command);
73+
CreateImageResponse createImageResponse = delegate
74+
.createCreateImageCmdExec().exec(command);
7275
imageNames.add(createImageResponse.getId());
7376
return createImageResponse;
7477
}
7578
};
7679
}
77-
78-
79-
80+
8081
@Override
8182
public RemoveImageCmd.Exec createRemoveImageCmdExec() {
8283
return new RemoveImageCmd.Exec() {
@@ -88,25 +89,26 @@ public Void exec(RemoveImageCmd command) {
8889
}
8990
};
9091
}
91-
92+
9293
@Override
9394
public BuildImageCmd.Exec createBuildImageCmdExec() {
9495
return new BuildImageCmd.Exec() {
9596
@Override
96-
public BuildImageCmd.Response exec(BuildImageCmd command) {
97+
public BuildImageCmd.Response exec(BuildImageCmd command) {
9798
// can't detect image id here so tagging it
9899
String tag = command.getTag();
99-
if(tag == null || "".equals(tag.trim())) {
100+
if (tag == null || "".equals(tag.trim())) {
100101
tag = "" + new SecureRandom().nextInt(Integer.MAX_VALUE);
101102
command.withTag(tag);
102103
}
103-
InputStream inputStream = delegate.createBuildImageCmdExec().exec(command);
104+
InputStream inputStream = delegate.createBuildImageCmdExec()
105+
.exec(command);
104106
imageNames.add(tag);
105107
return new BuildImageCmdExec.ResponseImpl(inputStream);
106108
}
107-
};
109+
};
108110
}
109-
111+
110112
@Override
111113
public Exec createAuthCmdExec() {
112114
return delegate.createAuthCmdExec();
@@ -122,12 +124,12 @@ public PingCmd.Exec createPingCmdExec() {
122124
return delegate.createPingCmdExec();
123125
}
124126

125-
@Override
126-
public ExecCreateCmd.Exec createExecCmdExec() {
127-
return delegate.createExecCmdExec();
128-
}
127+
@Override
128+
public ExecCreateCmd.Exec createExecCmdExec() {
129+
return delegate.createExecCmdExec();
130+
}
129131

130-
@Override
132+
@Override
131133
public VersionCmd.Exec createVersionCmdExec() {
132134
return delegate.createVersionCmdExec();
133135
}
@@ -141,9 +143,11 @@ public PullImageCmd.Exec createPullImageCmdExec() {
141143
public PushImageCmd.Exec createPushImageCmdExec() {
142144
return delegate.createPushImageCmdExec();
143145
}
144-
145-
@Override
146-
public SaveImageCmd.Exec createSaveImageCmdExec() { return delegate.createSaveImageCmdExec(); }
146+
147+
@Override
148+
public SaveImageCmd.Exec createSaveImageCmdExec() {
149+
return delegate.createSaveImageCmdExec();
150+
}
147151

148152
@Override
149153
public SearchImagesCmd.Exec createSearchImagesCmdExec() {
@@ -185,12 +189,12 @@ public AttachContainerCmd.Exec createAttachContainerCmdExec() {
185189
return delegate.createAttachContainerCmdExec();
186190
}
187191

188-
@Override
189-
public ExecStartCmd.Exec createExecStartCmdExec() {
190-
return delegate.createExecStartCmdExec();
191-
}
192+
@Override
193+
public ExecStartCmd.Exec createExecStartCmdExec() {
194+
return delegate.createExecStartCmdExec();
195+
}
192196

193-
@Override
197+
@Override
194198
public LogContainerCmd.Exec createLogContainerCmdExec() {
195199
return delegate.createLogContainerCmdExec();
196200
}
@@ -253,11 +257,9 @@ public EventsCmd.Exec createEventsCmdExec() {
253257
public List<String> getContainerNames() {
254258
return new ArrayList<String>(containerNames);
255259
}
256-
260+
257261
public List<String> getImageNames() {
258262
return new ArrayList<String>(imageNames);
259263
}
260264

261-
262-
263265
}

0 commit comments

Comments
 (0)