Fix test for Win & filter tests requiring remote resources #1127
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…cleanups Flag tests with RequiresRemoteResource to enable filtering Remove unused imports Update junit version Log useful info and error conditions
AndyGee
commented
May 9, 2019
| iteration++; | ||
| iteration++; | ||
| loop = !result && iteration < totalIterations; | ||
| if (loop) { |
There was a problem hiding this comment.
Only wait if we're going to loop again
AndyGee
changed the title
AndyGee
changed the title
AndyGee
commented
May 12, 2019
| @@ -37,7 +37,7 @@ | |||
| public static final String CLEAN = "clean"; | |||
| public static final String REMOVE_VOLUMES = "removeVolumes"; | |||
| public static final String CLEAN_BUILD_IMAGE = "cleanBuildImage"; | |||
| static final String DIND_RESOLUTION = "dockerInsideDockerResolution"; | |||
| public static final String DIND_RESOLUTION = "dockerInsideDockerResolution"; | |||
AndyGee
commented
May 12, 2019
|
|
||
| String machineName = config.get(CubeDockerConfiguration.DOCKER_MACHINE_NAME); | ||
| String machineUrl = CubeDockerConfiguration.resolveUrl(machineVersion); | ||
|
|
||
| if (!dockerMachineFileExist) { | ||
| dockerMachineFile.getParentFile().mkdirs(); | ||
| final File parentFile = dockerMachineFile.getParentFile(); |
AndyGee
commented
May 12, 2019
| System.setProperty(String.format("%s.ip", cubePrefix), bindings.getIP()); | ||
| System.setProperty(String.format("%s.internal.ip", cubePrefix), bindings.getInternalIP()); | ||
|
|
||
| final String ip = bindings.getIP(); |
There was a problem hiding this comment.
value or empty string
AndyGee
commented
May 12, 2019
| @@ -519,6 +506,16 @@ private void initializeCube() { | |||
| } | |||
| cubeController.create(containerName); | |||
| cubeController.start(containerName); | |||
| logger.log(Level.INFO, "Started container: " + getContainerInfo(containerName)); | |||
There was a problem hiding this comment.
Really useful info if available
AndyGee
commented
May 12, 2019
|
|
||
| this.dockerClient = buildDockerClient(); | ||
|
|
||
|
|
There was a problem hiding this comment.
Rather than exposing this outside it made sense to me to add a shutdown hook for this important cleanup.
AndyGee
commented
May 12, 2019
| @@ -1168,6 +1182,10 @@ public URI getDockerUri() { | |||
| return dockerUri; | |||
| } | |||
|
|
|||
| public boolean isDockerInsideDockerResolution() { | |||
There was a problem hiding this comment.
This Object is passed around (config is not) and providing this here is useful to understand the client context.
AndyGee
commented
May 12, 2019
| @@ -57,11 +59,11 @@ | |||
| Top top; | |||
|
|
|||
| private static Matcher<String> defaultDockerMachineCertPath() { | |||
| return containsString(".docker/machine/machines"); | |||
| return containsString(".docker" + File.separator + "machine" + File.separator + "machines"); | |||
There was a problem hiding this comment.
Win fix, really need to ensure such paths are independent everywhere.
AndyGee
commented
May 12, 2019
| } | ||
|
|
||
| return null; |
There was a problem hiding this comment.
This is always the fallback
AndyGee
commented
May 12, 2019
| import org.junit.runner.RunWith; | ||
|
|
||
| @RunWith(Arquillian.class) | ||
| @Category({RequiresRemoteResource.class}) |
There was a problem hiding this comment.
This allows tests to be excluded that make real remote calls, which just breaks when behind a corporate firewall.
AndyGee
commented
May 12, 2019
| @@ -26,12 +26,11 @@ | |||
| </plugin> | |||
| <plugin> | |||
| <artifactId>maven-surefire-plugin</artifactId> | |||
| <version>2.19.1</version> | |||
AndyGee
commented
May 12, 2019
| <dependencies> | ||
| <dependency> | ||
| <groupId>org.junit.platform</groupId> | ||
| <artifactId>junit-platform-surefire-provider</artifactId> | ||
| <version>1.0.2</version> | ||
| <version>1.3.2</version> |
There was a problem hiding this comment.
Junit 5 doesn't need Java 7 backwards compatibility
AndyGee
commented
May 12, 2019
| import java.util.logging.Logger; | ||
|
|
||
| import static org.arquillian.cube.docker.impl.client.reporter.DockerEnvironmentReportKey.*; | ||
| import static org.arquillian.cube.docker.impl.client.reporter.DockerEnvironmentReportKey.DOCKER_API_VERSION; |
There was a problem hiding this comment.
There are a lot more import cleanups, but it'd make this PR crazy.
AndyGee
commented
May 12, 2019
| .hasName(DOCKER_ENVIRONMENT) | ||
| .hasNumberOfSubReports(1) | ||
| .hasEntriesContaining( | ||
| new KeyValueEntry(DOCKER_COMPOSITION_SCHEMA, new FileEntry("reports" + File.separatorChar + "schemas" + File.separatorChar + "docker_composition.png")), |
lordofthejars
approved these changes
May 13, 2019
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Trivial cleanups
Short description of what this resolves:
Fix tests on Win and allow filtering of tests that attempt to access remote resources (eg, blocked by a firewall).
Changes proposed in this pull request:
Preparation of #1107 - Which is a much larger WIP PR for later