Skip to content

Commit d9ee8cd

Browse files
authored
Updated flaky test (#50)
1 parent d501d29 commit d9ee8cd

1 file changed

Lines changed: 3 additions & 9 deletions

File tree

src/test/java/cd/go/contrib/elasticagents/dockerswarm/elasticagent/DockerServiceTest.java

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@
1818

1919
import cd.go.contrib.elasticagents.dockerswarm.elasticagent.requests.CreateAgentRequest;
2020
import com.google.common.collect.ImmutableList;
21-
import com.spotify.docker.client.DockerClient;
22-
import com.spotify.docker.client.messages.Container;
2321
import com.spotify.docker.client.messages.Volume;
2422
import com.spotify.docker.client.messages.mount.Mount;
2523
import com.spotify.docker.client.messages.swarm.*;
@@ -33,7 +31,8 @@
3331

3432
import static java.lang.String.format;
3533
import static org.hamcrest.Matchers.*;
36-
import static org.junit.Assert.*;
34+
import static org.junit.Assert.assertEquals;
35+
import static org.junit.Assert.assertThat;
3736

3837
public class DockerServiceTest extends BaseTest {
3938

@@ -109,13 +108,8 @@ public void shouldStartContainerWithCorrectCommand() throws Exception {
109108
DockerService service = DockerService.create(new CreateAgentRequest("key", properties, "prod"), createSettings(), docker);
110109
services.add(service.name());
111110
Service serviceInfo = docker.inspectService(service.name());
112-
assertThat(serviceInfo.spec().taskTemplate().containerSpec().command(), is(command));
113-
114-
List<Container> containers = waitForContainerToStart(service, 15);
115111

116-
String logs = docker.logs(containers.get(0).id(), DockerClient.LogsParam.stdout()).readFully();
117-
assertThat(logs, containsString("127.0.0.1")); // from /etc/hosts
118-
assertThat(logs, containsString("floppy:x:11:root")); // from /etc/group
112+
assertThat(serviceInfo.spec().taskTemplate().containerSpec().command(), is(command));
119113
}
120114

121115
@Test

0 commit comments

Comments
 (0)