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

Adjust wording of pre-flight check messages to be clearer #457

Merged
merged 2 commits into from
Sep 18, 2017
Merged

Adjust wording of pre-flight check messages to be clearer #457

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
bd40250
Adjust wording of pre-flight check messages to be clearer
rnorth Sep 18, 2017
7f1522e
Update changelog
rnorth Sep 18, 2017
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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ All notable changes to this project will be documented in this file.
### Changed
- Load `DockerClientProviderStrategy` via Service Loader (#434, #435)
- Make it possible to specify docker compose container in configuration (#422, #425)
- Clarify wording of pre-flight check messages (#457, #436)


## [1.4.2] - 2017-07-25
Expand Down
6 changes: 3 additions & 3 deletions core/src/main/java/org/testcontainers/DockerClientFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ public boolean matches(Object o) {

@Override
public void describeTo(Description description) {
description.appendText("is newer than 1.6.0");
description.appendText("should be at least 1.6.0");
}
});
}
Expand All @@ -162,7 +162,7 @@ private void checkDiskSpace(DockerClient dockerClient, String id) {
DiskSpaceUsage df = parseAvailableDiskSpace(outputStream.toString());

VisibleAssertions.assertTrue(
"Docker environment has more than 2GB free",
"Docker environment should have more than 2GB free disk space",
df.availableMB.map(it -> it >= 2048).orElse(true)
);
}
Expand All @@ -187,7 +187,7 @@ private void checkExposedPort(String hostIpAddress, DockerClient dockerClient, S
} catch (IOException e) {
response = e.getMessage();
}
VisibleAssertions.assertEquals("Exposed port is accessible", "hello", response);
VisibleAssertions.assertEquals("A port exposed by a docker container should be accessible", "hello", response);
}

/**
Expand Down