Skip to content

Commit 0f3d479

Browse files
KostyaShaKostyaSha
committed
Swarm tests.
1 parent fbd1ce1 commit 0f3d479

34 files changed

+239
-76
lines changed

‎.travis.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,9 @@ env:
2323

2424
matrix:
2525
- repo="main" DOCKER_HOST="tcp://127.0.0.1:2375" DOCKER_VERSION="17.05.0~ce-0~ubuntu-trusty" DEPLOY=true COVERITY=true
26+
- repo="main" DOCKER_HOST="tcp://127.0.0.1:2377" DOCKER_VERSION="17.05.0~ce-0~ubuntu-trusty" SWARM_VERSION="1.2.6"
2627
- repo="main" DOCKER_HOST="unix:///var/run/docker.sock" DOCKER_VERSION="17.05.0~ce-0~ubuntu-trusty"
28+
- repo="main" DOCKER_HOST="tcp://127.0.0.1:2377" DOCKER_VERSION="1.13.1-0~ubuntu-trusty" SWARM_VERSION="1.2.6"
2729
- repo="main" DOCKER_HOST="tcp://127.0.0.1:2375" DOCKER_VERSION="1.13.1-0~ubuntu-trusty"
2830
- repo="main" DOCKER_HOST="unix:///var/run/docker.sock" DOCKER_VERSION="1.13.1-0~ubuntu-trusty"
2931
- repo="main" DOCKER_HOST="tcp://127.0.0.1:2375" DOCKER_VERSION="1.12.6-0~ubuntu-trusty"

‎src/main/java/com/github/dockerjava/api/model/PullResponseItem.java

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@ public class PullResponseItem extends ResponseItem {
1919

2020
private static final String DOWNLOAD_COMPLETE = "Download complete";
2121

22+
private static final String DOWNLOADED_SWARM = ": downloaded";
23+
2224
/**
2325
* Returns whether the status indicates a successful pull operation
2426
*
@@ -30,7 +32,11 @@ public boolean isPullSuccessIndicated() {
3032
return false;
3133
}
3234

33-
return (getStatus().contains(DOWNLOAD_COMPLETE) || getStatus().contains(IMAGE_UP_TO_DATE)
34-
|| getStatus().contains(DOWNLOADED_NEWER_IMAGE) || getStatus().contains(LEGACY_REGISTRY));
35+
return (getStatus().contains(DOWNLOAD_COMPLETE) ||
36+
getStatus().contains(IMAGE_UP_TO_DATE) ||
37+
getStatus().contains(DOWNLOADED_NEWER_IMAGE) ||
38+
getStatus().contains(LEGACY_REGISTRY) ||
39+
getStatus().contains(DOWNLOADED_SWARM)
40+
);
3541
}
3642
}

‎src/test/java/com/github/dockerjava/core/command/CommitCmdImplTest.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package com.github.dockerjava.core.command;
22

3+
import static com.github.dockerjava.utils.TestUtils.isSwarm;
34
import static org.hamcrest.MatcherAssert.assertThat;
45
import static org.hamcrest.Matchers.equalTo;
56
import static org.hamcrest.Matchers.isEmptyString;
@@ -12,6 +13,7 @@
1213

1314
import com.google.common.collect.ImmutableMap;
1415
import org.testng.ITestResult;
16+
import org.testng.SkipException;
1517
import org.testng.annotations.AfterMethod;
1618
import org.testng.annotations.AfterTest;
1719
import org.testng.annotations.BeforeMethod;
@@ -49,6 +51,8 @@ public void afterMethod(ITestResult result) {
4951

5052
@Test
5153
public void commit() throws DockerException {
54+
//FIXME swarm
55+
if (isSwarm(dockerClient)) throw new SkipException("FIXME Swarm");
5256

5357
CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("touch", "/test").exec();
5458

‎src/test/java/com/github/dockerjava/core/command/ConnectToNetworkCmdImplTest.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
import com.github.dockerjava.api.model.Network;
99
import com.github.dockerjava.client.AbstractDockerClientTest;
1010
import org.testng.ITestResult;
11+
import org.testng.SkipException;
1112
import org.testng.annotations.AfterMethod;
1213
import org.testng.annotations.AfterTest;
1314
import org.testng.annotations.BeforeMethod;
@@ -17,6 +18,7 @@
1718
import java.lang.reflect.Method;
1819
import java.util.Collections;
1920

21+
import static com.github.dockerjava.utils.TestUtils.isSwarm;
2022
import static org.hamcrest.Matchers.hasItem;
2123
import static org.hamcrest.core.Is.is;
2224
import static org.junit.Assert.assertThat;
@@ -46,6 +48,7 @@ public void afterMethod(ITestResult result) {
4648

4749
@Test
4850
public void connectToNetwork() throws InterruptedException {
51+
if (isSwarm(dockerClient)) throw new SkipException("Swarm has no network");
4952

5053
CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999").exec();
5154
dockerClient.startContainerCmd(container.getId()).exec();
@@ -65,6 +68,8 @@ public void connectToNetwork() throws InterruptedException {
6568

6669
@Test
6770
public void connectToNetworkWithContainerNetwork() throws InterruptedException {
71+
if (isSwarm(dockerClient)) throw new SkipException("Swarm has no network");
72+
6873
final String NETWORK_SUBNET = "10.100.102.0/24";
6974
final String NETWORK_NAME = "jerseyTestNetwork";
7075
final String CONTAINER_IP = "10.100.102.100";

‎src/test/java/com/github/dockerjava/core/command/CopyFileFromContainerCmdImplTest.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package com.github.dockerjava.core.command;
22

33
import static com.github.dockerjava.utils.TestUtils.getVersion;
4+
import static com.github.dockerjava.utils.TestUtils.isSwarm;
45
import static org.hamcrest.MatcherAssert.assertThat;
56
import static org.hamcrest.Matchers.isEmptyOrNullString;
67
import static org.hamcrest.Matchers.not;
@@ -50,6 +51,8 @@ public void copyFromContainer() throws Exception {
5051
if (getVersion(dockerClient).isGreaterOrEqual(RemoteApiVersion.VERSION_1_24)) {
5152
throw new SkipException("Doesn't work since 1.24");
5253
}
54+
//FIXME swarm
55+
if (isSwarm(dockerClient)) throw new SkipException("FIXME Swarm");
5356

5457
// TODO extract this into a shared method
5558
CreateContainerResponse container = dockerClient.createContainerCmd("busybox")

‎src/test/java/com/github/dockerjava/core/command/CreateContainerCmdImplTest.java

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,14 +43,18 @@
4343

4444
import static com.github.dockerjava.api.model.Capability.MKNOD;
4545
import static com.github.dockerjava.api.model.Capability.NET_ADMIN;
46+
import static com.github.dockerjava.utils.TestUtils.isSwarm;
4647
import static com.github.dockerjava.utils.TestUtils.getVersion;
4748
import static org.hamcrest.MatcherAssert.assertThat;
49+
import static org.hamcrest.Matchers.allOf;
4850
import static org.hamcrest.Matchers.contains;
4951
import static org.hamcrest.Matchers.containsInAnyOrder;
5052
import static org.hamcrest.Matchers.containsString;
5153
import static org.hamcrest.Matchers.equalTo;
54+
import static org.hamcrest.Matchers.hasEntry;
5255
import static org.hamcrest.Matchers.hasItem;
5356
import static org.hamcrest.Matchers.hasItemInArray;
57+
import static org.hamcrest.Matchers.hasItems;
5458
import static org.hamcrest.Matchers.is;
5559
import static org.hamcrest.Matchers.isEmptyString;
5660
import static org.hamcrest.Matchers.not;
@@ -281,6 +285,7 @@ public void createContainerWithLink() throws DockerException {
281285

282286
@Test
283287
public void createContainerWithLinkInCustomNetwork() throws DockerException {
288+
if (isSwarm(dockerClient)) throw new SkipException("Swarm has no network");
284289

285290
CreateNetworkResponse createNetworkResponse = dockerClient.createNetworkCmd()
286291
.withName("linkNet")
@@ -318,11 +323,12 @@ public void createContainerWithLinkInCustomNetwork() throws DockerException {
318323

319324
ContainerNetwork linkNet = inspectContainerResponse2.getNetworkSettings().getNetworks().get("linkNet");
320325
assertNotNull(linkNet);
321-
ArrayAsserts.assertArrayEquals(new Link[]{ new Link("container1", "container1Link")}, linkNet.getLinks());
326+
ArrayAsserts.assertArrayEquals(new Link[]{new Link("container1", "container1Link")}, linkNet.getLinks());
322327
}
323328

324329
@Test
325330
public void createContainerWithCustomIp() throws DockerException {
331+
if (isSwarm(dockerClient)) throw new SkipException("Swarm has no network");
326332

327333
CreateNetworkResponse createNetworkResponse = dockerClient.createNetworkCmd()
328334
.withIpam(new Network.Ipam()
@@ -355,6 +361,7 @@ public void createContainerWithCustomIp() throws DockerException {
355361

356362
@Test
357363
public void createContainerWithAlias() throws DockerException {
364+
if (isSwarm(dockerClient)) throw new SkipException("Swarm has no network");
358365

359366
CreateNetworkResponse createNetworkResponse = dockerClient.createNetworkCmd()
360367
.withName("aliasNet")
@@ -653,7 +660,12 @@ public void createContainerWithLabels() throws DockerException {
653660

654661
// null becomes empty string
655662
labels.put("com.github.dockerjava.null", "");
656-
assertThat(inspectContainerResponse.getConfig().getLabels(), is(equalTo(labels)));
663+
664+
// swarm adds 3d label
665+
assertThat(inspectContainerResponse.getConfig().getLabels(), allOf(
666+
hasEntry("com.github.dockerjava.null", ""),
667+
hasEntry("com.github.dockerjava.Boolean", "true")
668+
));
657669
}
658670

659671
@Test(groups = "ignoreInCircleCi")
@@ -745,7 +757,7 @@ public void createContainerWithCgroupParent() throws DockerException {
745757
public void createContainerWithShmSize() throws DockerException {
746758
HostConfig hostConfig = new HostConfig().withShmSize(96 * FileUtils.ONE_MB);
747759
CreateContainerResponse container = dockerClient.createContainerCmd(BUSYBOX_IMAGE)
748-
.withHostConfig(hostConfig).withCmd("true").exec();
760+
.withHostConfig(hostConfig).withCmd("true").exec();
749761

750762
LOG.info("Created container {}", container.toString());
751763

‎src/test/java/com/github/dockerjava/core/command/CreateNetworkCmdImplTest.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@
1919

2020
import static com.github.dockerjava.utils.TestUtils.getVersion;
2121

22+
import static com.github.dockerjava.utils.TestUtils.isSwarm;
23+
2224
@Test(groups = "integration")
2325
public class CreateNetworkCmdImplTest extends AbstractDockerClientTest {
2426

@@ -44,6 +46,7 @@ public void afterMethod(ITestResult result) {
4446

4547
@Test
4648
public void createNetwork() throws DockerException {
49+
if (isSwarm(dockerClient)) throw new SkipException("Swarm has no network");
4750

4851
String networkName = "testNetwork";
4952

@@ -58,6 +61,7 @@ public void createNetwork() throws DockerException {
5861

5962
@Test
6063
public void createNetworkWithIpamConfig() throws DockerException {
64+
if (isSwarm(dockerClient)) throw new SkipException("Swarm has no network");
6165

6266
String networkName = "testNetwork";
6367
Network.Ipam ipam = new Network.Ipam().withConfig(new Network.Ipam.Config().withSubnet("10.67.79.0/24"));

‎src/test/java/com/github/dockerjava/core/command/DisconnectFromNetworkCmdImplTest.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import com.github.dockerjava.api.model.Network;
66
import com.github.dockerjava.client.AbstractDockerClientTest;
77
import org.testng.ITestResult;
8+
import org.testng.SkipException;
89
import org.testng.annotations.AfterMethod;
910
import org.testng.annotations.AfterTest;
1011
import org.testng.annotations.BeforeMethod;
@@ -13,6 +14,8 @@
1314

1415
import java.lang.reflect.Method;
1516

17+
import static com.github.dockerjava.utils.TestUtils.isSwarm;
18+
1619
@Test(groups = "integration")
1720
public class DisconnectFromNetworkCmdImplTest extends AbstractDockerClientTest {
1821

@@ -38,6 +41,7 @@ public void afterMethod(ITestResult result) {
3841

3942
@Test
4043
public void disconnectFromNetwork() throws InterruptedException {
44+
if (isSwarm(dockerClient)) throw new SkipException("Swarm has no network");
4145

4246
CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("sleep", "9999").exec();
4347
dockerClient.startContainerCmd(container.getId()).exec();
@@ -59,6 +63,7 @@ public void disconnectFromNetwork() throws InterruptedException {
5963

6064
@Test
6165
public void forceDisconnectFromNetwork() throws InterruptedException {
66+
if (isSwarm(dockerClient)) throw new SkipException("Swarm has no network");
6267

6368
CreateNetworkResponse network = dockerClient.createNetworkCmd().withName("testNetwork").exec();
6469

‎src/test/java/com/github/dockerjava/core/command/EventsCmdImplTest.java

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
import java.util.concurrent.TimeUnit;
88

99
import org.testng.ITestResult;
10+
import org.testng.SkipException;
1011
import org.testng.annotations.AfterMethod;
1112
import org.testng.annotations.AfterTest;
1213
import org.testng.annotations.BeforeMethod;
@@ -17,6 +18,8 @@
1718
import com.github.dockerjava.api.model.Event;
1819
import com.github.dockerjava.client.AbstractDockerClientTest;
1920

21+
import static com.github.dockerjava.utils.TestUtils.isSwarm;
22+
2023
/*
2124
* NOTE: These tests may fail if there is a difference between local and daemon time
2225
* (this is especially a problem when using boot2docker as time may not in sync
@@ -51,6 +54,8 @@ public void afterMethod(ITestResult result) {
5154

5255
@Test
5356
public void testEventStreamTimeBound() throws Exception {
57+
if (isSwarm(dockerClient)) throw new SkipException("FIXME Swarm");
58+
5459
// Don't include other tests events
5560
TimeUnit.SECONDS.sleep(1);
5661

@@ -95,6 +100,8 @@ public void testEventStreaming() throws Exception {
95100

96101

97102
public void testEventStreamingWithFilter() throws Exception {
103+
if (isSwarm(dockerClient)) throw new SkipException("FIXME Swarm");
104+
98105
// Don't include other tests events
99106
TimeUnit.SECONDS.sleep(1);
100107

‎src/test/java/com/github/dockerjava/core/command/ExecStartCmdImplTest.java

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,19 @@
11
package com.github.dockerjava.core.command;
22

3+
import static com.github.dockerjava.utils.TestUtils.isSwarm;
4+
import static org.hamcrest.MatcherAssert.assertThat;
5+
import static org.hamcrest.Matchers.isEmptyString;
6+
import static org.hamcrest.Matchers.not;
7+
38
import com.github.dockerjava.api.command.CreateContainerResponse;
49
import com.github.dockerjava.api.command.ExecCreateCmdResponse;
510
import com.github.dockerjava.api.exception.NotFoundException;
611
import com.github.dockerjava.client.AbstractDockerClientTest;
712
import java.io.InputStream;
813
import java.lang.reflect.Method;
914
import java.security.SecureRandom;
10-
import static org.hamcrest.MatcherAssert.assertThat;
11-
import static org.hamcrest.Matchers.isEmptyString;
12-
import static org.hamcrest.Matchers.not;
1315
import org.testng.ITestResult;
16+
import org.testng.SkipException;
1417
import org.testng.annotations.AfterMethod;
1518
import org.testng.annotations.AfterTest;
1619
import org.testng.annotations.BeforeMethod;
@@ -41,6 +44,9 @@ public void afterMethod(ITestResult result) {
4144

4245
@Test(groups = "ignoreInCircleCi")
4346
public void execStart() throws Exception {
47+
//FIXME swarm
48+
if (isSwarm(dockerClient)) throw new SkipException("FIXME Swarm");
49+
4450
String containerName = "generated_" + new SecureRandom().nextInt();
4551

4652
CreateContainerResponse container = dockerClient.createContainerCmd("busybox").withCmd("top")
@@ -90,7 +96,7 @@ public void execStartAttached() throws Exception {
9096
assertNotNull(responseAsString);
9197
assertTrue(responseAsString.length() > 0);
9298
}
93-
99+
94100
@Test(groups = "ignoreInCircleCi", expectedExceptions = NotFoundException.class)
95101
public void execStartWithNonExistentUser() throws Exception {
96102
String containerName = "generated_" + new SecureRandom().nextInt();

0 commit comments

Comments
 (0)