[11u] RFR: 8221710: [TESTBUG] more configurable parameters for docker testing

[Langer, Christoph]

Looks good.

> -----Original Message-----
> From: jdk-updates-dev <jdk-updates-dev-bounces at openjdk.java.net> On
> Behalf Of Severin Gehwolf
> Sent: Montag, 22. Juli 2019 08:10
> To: jdk-updates-dev at openjdk.java.net
> Subject: [11u] RFR: 8221710: [TESTBUG] more configurable parameters for
> docker testing
>
> Hi,
>
> Please review one additional docker tests backport. A pre-requisite for
> JDK-8224165 to bring down which helps verifying JDK-8220672. The JDK 13
> patch applies cleanly, but doesn't work without modifications pointed
> out below as JDK 11 doesn't have SkippedException (which is a rather
> large changeset to bring down)
>
> Bug: https://bugs.openjdk.java.net/browse/JDK-8221710
> webrev: http://cr.openjdk.java.net/~sgehwolf/webrevs/JDK-
> 8221710/jdk11/01/webrev/
> original changeset: http://hg.openjdk.java.net/jdk/jdk/rev/b354ffb03ae4
>
> Testing: Ran docker tests on Linux x86_64
>
> Thoughts?
>
> Thanks,
> Severin
>
> diff --git a/test/lib/jdk/test/lib/containers/docker/DockerTestUtils.java
> b/test/lib/jdk/test/lib/containers/docker/DockerTestUtils.java
> --- a/test/lib/jdk/test/lib/containers/docker/DockerTestUtils.java
> +++ b/test/lib/jdk/test/lib/containers/docker/DockerTestUtils.java
> @@ -38,7 +38,6 @@
>  import jdk.test.lib.Utils;
>  import jdk.test.lib.process.OutputAnalyzer;
>  import jdk.test.lib.process.ProcessTools;
> -import jtreg.SkippedException;
>
>
>  public class DockerTestUtils {
> @@ -92,7 +91,9 @@
>          if (isDockerEngineAvailable()) {
>              return true;
>          } else {
> -            throw new SkippedException("Docker engine is not available on this
> system");
> +            System.out.println("Docker engine is not available on this system");
> +            System.out.println("This test is SKIPPED");
> +            return false;
>          }
>      }
>
>