Skip to content
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

Jump to bottom

Allow for docker timestamps with timezone offsets #4073

Merged
merged 2 commits into from
Jul 16, 2021
Merged

Allow for docker timestamps with timezone offsets #4073

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a84a32a
Allow for docker timestamps with timezone offsets
candrews May 10, 2021
fa28f2b
Merge branch 'master' into patch-2
rnorth Jul 16, 2021
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
4 changes: 2 additions & 2 deletions core/src/main/java/org/testcontainers/utility/DockerStatus.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ public static boolean isContainerRunning(InspectContainerResponse.ContainerState
if (minimumRunningDuration == null) {
return true;
}
Instant startedAt = DateTimeFormatter.ISO_INSTANT.parse(
Instant startedAt = DateTimeFormatter.ISO_OFFSET_DATE_TIME.parse(
state.getStartedAt(), Instant::from);

if (startedAt.isBefore(now.minus(minimumRunningDuration))) {
Expand Down Expand Up @@ -75,7 +75,7 @@ public static boolean isDockerTimestampNonEmpty(String dockerTimestamp) {
return dockerTimestamp != null
&& !dockerTimestamp.isEmpty()
&& !dockerTimestamp.equals(DOCKER_TIMESTAMP_ZERO)
&& DateTimeFormatter.ISO_INSTANT.parse(dockerTimestamp, Instant::from).getEpochSecond() >= 0L;
&& DateTimeFormatter.ISO_OFFSET_DATE_TIME.parse(dockerTimestamp, Instant::from).getEpochSecond() >= 0L;
}

public static boolean isContainerExitCodeSuccess(InspectContainerResponse.ContainerState state) {
Expand Down
53 changes: 35 additions & 18 deletions core/src/test/java/org/testcontainers/utility/DockerStatusTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,13 @@

import com.github.dockerjava.api.command.InspectContainerResponse;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.mockito.Mockito;

import java.time.Duration;
import java.time.Instant;
import java.time.ZoneId;
import java.time.format.DateTimeFormatter;

import static org.junit.Assert.assertFalse;
Expand All @@ -15,33 +18,47 @@
/**
*
*/
@RunWith(Parameterized.class)
public class DockerStatusTest {
private final DateTimeFormatter dateTimeFormatter;

private static Instant now = Instant.now();
private static final Instant now = Instant.now();

private static InspectContainerResponse.ContainerState running =
buildState(true, false, buildTimestamp(now.minusMillis(30)), DockerStatus.DOCKER_TIMESTAMP_ZERO);
private final InspectContainerResponse.ContainerState running;

private static InspectContainerResponse.ContainerState runningVariant =
buildState(true, false, buildTimestamp(now.minusMillis(30)), "");
private final InspectContainerResponse.ContainerState runningVariant;

private static InspectContainerResponse.ContainerState shortRunning =
buildState(true, false, buildTimestamp(now.minusMillis(10)), DockerStatus.DOCKER_TIMESTAMP_ZERO);
private final InspectContainerResponse.ContainerState shortRunning;

private static InspectContainerResponse.ContainerState created =
buildState(false, false, DockerStatus.DOCKER_TIMESTAMP_ZERO, DockerStatus.DOCKER_TIMESTAMP_ZERO);
private final InspectContainerResponse.ContainerState created;

// a container in the "created" state is not running, and has both startedAt and finishedAt empty.
private static InspectContainerResponse.ContainerState createdVariant =
buildState(false, false, null, null);
private final InspectContainerResponse.ContainerState createdVariant;

private static InspectContainerResponse.ContainerState exited =
buildState(false, false, buildTimestamp(now.minusMillis(100)), buildTimestamp(now.minusMillis(90)));
private final InspectContainerResponse.ContainerState exited;

private static InspectContainerResponse.ContainerState paused =
buildState(false, true, buildTimestamp(now.minusMillis(100)), DockerStatus.DOCKER_TIMESTAMP_ZERO);
private final InspectContainerResponse.ContainerState paused;

private static Duration minimumDuration = Duration.ofMillis(20);
private static final Duration minimumDuration = Duration.ofMillis(20);

public DockerStatusTest(DateTimeFormatter dateTimeFormatter) {
this.dateTimeFormatter = dateTimeFormatter;
running = buildState(true, false, buildTimestamp(now.minusMillis(30)), DockerStatus.DOCKER_TIMESTAMP_ZERO);
runningVariant = buildState(true, false, buildTimestamp(now.minusMillis(30)), "");
shortRunning = buildState(true, false, buildTimestamp(now.minusMillis(10)), DockerStatus.DOCKER_TIMESTAMP_ZERO);
created = buildState(false, false, DockerStatus.DOCKER_TIMESTAMP_ZERO, DockerStatus.DOCKER_TIMESTAMP_ZERO);
createdVariant = buildState(false, false, null, null);
exited = buildState(false, false, buildTimestamp(now.minusMillis(100)), buildTimestamp(now.minusMillis(90)));
paused = buildState(false, true, buildTimestamp(now.minusMillis(100)), DockerStatus.DOCKER_TIMESTAMP_ZERO);
}

@Parameterized.Parameters
public static Object[][] parameters() {
return new Object[][] {
{ DateTimeFormatter.ISO_INSTANT},
{ DateTimeFormatter.ISO_OFFSET_DATE_TIME.withZone(ZoneId.of("America/New_York")) }
};
}

@Test
public void testRunning() throws Exception {
Expand All @@ -65,8 +82,8 @@ public void testStopped() throws Exception {
assertFalse(DockerStatus.isContainerStopped(paused));
}

private static String buildTimestamp(Instant instant) {
return DateTimeFormatter.ISO_INSTANT.format(instant);
private String buildTimestamp(Instant instant) {
return dateTimeFormatter.format(instant);
}

// ContainerState is a non-static inner class, with private member variables, in a different package.
Expand Down