Skip to content

Starts v0.10.0 #37

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
marcuslinke merged 14 commits into from
Aug 2, 2014
Merged

Starts v0.10.0 #37

Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
134f241
Renames Response objects to match their assoc cmds
mfulgo Jul 31, 2014
dc0e625
Moves response objects to the commands package
mfulgo Jul 31, 2014
e904a40
Renames ImportImageCmd to CreateImageCmd
mfulgo Jul 31, 2014
4c21760
Adds test for CopyFileFromContainer
mfulgo Aug 1, 2014
65d4225
Swaps model toStrings with Commons ToStringBuilder
mfulgo Jul 31, 2014
442fa8b
Swaps responses' toStrings for Commons' ToStringBuilder
mfulgo Jul 31, 2014
476dafc
Moves CommitConfig into CommitCmd
mfulgo Aug 1, 2014
8d572c6
Fixes a bug in the InfoCmdTest
mfulgo Aug 1, 2014
14f911e
Adds some TODOs
mfulgo Aug 1, 2014
f8e3d3a
Moves more Config objects into their assoc Cmds
mfulgo Aug 1, 2014
52c7d2a
Removes top-level HostConfig
mfulgo Aug 1, 2014
b7bbcfe
Renames Config to DockerClientConfig
mfulgo Aug 1, 2014
a2b68c5
Removes setCredentials from DockerClient
mfulgo Aug 1, 2014
70aba65
Merge remote-tracking branch 'origin/master' into for-upstream-v0.10.0
mfulgo Aug 1, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fixes a bug in the InfoCmdTest 
If you don't have any of your own containers, the InfoCmd integration
test can fail. This commit makes sure there's at least one container
present.
  • Loading branch information
@mfulgo
mfulgo committed Aug 1, 2014
commit 8d572c6e9ce4e2aead81353ca09713e796bd10f7
23 changes: 20 additions & 3 deletions src/test/java/com/github/dockerjava/client/command/InfoCmdTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,17 @@
import com.github.dockerjava.client.DockerException;
import com.github.dockerjava.client.model.Info;

import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.isEmptyOrNullString;
import static org.hamcrest.Matchers.not;

public class InfoCmdTest extends AbstractDockerClientTest {

@BeforeTest
public void beforeTest() throws DockerException {
super.beforeTest();
}

@AfterTest
public void afterTest() {
super.afterTest();
Expand All @@ -34,10 +38,23 @@ public void beforeMethod(Method method) {
public void afterMethod(ITestResult result) {
super.afterMethod(result);
}

@Test
public void info() throws DockerException {
Info dockerInfo = dockerClient.infoCmd().exec();
// Make sure that there is at least one container for the assertion
// TODO extract this into a shared method
CreateContainerResponse container = dockerClient.createContainerCmd("busybox")
.withName("docker-java-itest-info")
.withCmd("touch", "/test")
.exec();

LOG.info("Created container: {}", container);
assertThat(container.getId(), not(isEmptyOrNullString()));

dockerClient.startContainerCmd(container.getId()).exec();
tmpContainers.add(container.getId());

Info dockerInfo = dockerClient.infoCmd().exec();
LOG.info(dockerInfo.toString());

assertTrue(dockerInfo.toString().contains("containers"));
Expand Down