Skip to content

Commit 2966b5c

Browse files
authored
Merge pull request spotify#1109 from llowrey/testBuildInterruption
Fixed bug in a unit test which caused test to block indefinitely
2 parents 6e623e2 + 5250ec6 commit 2966b5c

File tree

1 file changed

+7
-2
lines changed

1 file changed

+7
-2
lines changed

src/test/java/com/spotify/docker/client/DefaultDockerClientTest.java

+7-2
Original file line numberDiff line numberDiff line change
@@ -237,6 +237,7 @@
237237
import java.net.Socket;
238238
import java.net.URI;
239239
import java.net.URISyntaxException;
240+
import java.net.URL;
240241
import java.net.URLEncoder;
241242
import java.nio.file.Path;
242243
import java.nio.file.Paths;
@@ -1039,16 +1040,20 @@ public void testBuildInterruption() throws Exception {
10391040
sut.removeImage(imageName);
10401041
} catch (DockerException ignored) {
10411042
}
1042-
final String dockerDirectory = Resources.getResource("dockerDirectorySleeping").getPath();
1043+
final URL dockerDirectoryUrl = Resources.getResource("dockerDirectorySleeping");
1044+
final Path dockerDirectory = Paths.get(dockerDirectoryUrl.toURI());
10431045

1044-
sut.build(Paths.get(dockerDirectory), imageName, message -> {
1046+
sut.build(dockerDirectory, imageName, message -> {
10451047
if (!started.isDone()) {
10461048
started.set(true);
10471049
}
10481050
});
10491051
} catch (InterruptedException e) {
10501052
interrupted.set(true);
10511053
throw e;
1054+
} catch (Throwable t) {
1055+
started.setException(t);
1056+
throw t;
10521057
}
10531058
return null;
10541059
});

0 commit comments

Comments
 (0)