Tests expected to fail

fs/etc/services.d/cadvisor/run

@@ -1,3 +1,5 @@
 #!/usr/bin/with-contenv sh
 
-exec s6-setuidgid "$PUID:$PGID" /usr/bin/cadvisor $CADVISOR_ARGS
+s6-setuidgid nonroot
+
+exec /usr/bin/cadvisor $CADVISOR_ARGS

tests/src/test/java/CadvisorContainerShould.java

@@ -2,25 +2,31 @@
 
 import java.io.IOException;
 import java.net.HttpURLConnection;
+import java.net.MalformedURLException;
 import java.net.URL;
 
 import org.junit.Test;
 
 public class CadvisorContainerShould extends ContainerTestBase {
+
  @Test
  public void listenOnWebUiPort() throws IOException {
- URL root = new URL(String.format("http:https://%s:%d",
- getContainer().getContainerIpAddress(),
- getContainer().getMappedPort(8080)));
+ startContainer();
 
- HttpURLConnection connection = (HttpURLConnection)root.openConnection();
-  connection.connect();
+ checkContainerListensOnWebUiPort();
+ }
 
- assertEquals(200, connection.getResponseCode());
+ @Test
+ public void listenOnWebUiPortWhenRunningAsRoot() throws IOException {
+ startContainer("0", "0");
+
+ checkContainerListensOnWebUiPort();
  }
 
  @Test
  public void returnMetrics() throws IOException {
+ startContainer();
+
  URL root = new URL(String.format("http:https://%s:%d/metrics",
  getContainer().getContainerIpAddress(),
  getContainer().getMappedPort(8080)));
@@ -33,6 +39,8 @@ public void returnMetrics() throws IOException {
 
  @Test
  public void returnSuccessOnHealthCheckEndpoint() throws IOException {
+ startContainer();
+
  URL root = new URL(String.format("http:https://%s:%d/healthz",
  getContainer().getContainerIpAddress(),
  getContainer().getMappedPort(8080)));
@@ -42,4 +50,15 @@ public void returnSuccessOnHealthCheckEndpoint() throws IOException {
 
  assertEquals(200, connection.getResponseCode());
  }
+
+ private void checkContainerListensOnWebUiPort() throws IOException {
+ URL root = new URL(String.format("http:https://%s:%d",
+ getContainer().getContainerIpAddress(),
+ getContainer().getMappedPort(8080)));
+
+ HttpURLConnection connection = (HttpURLConnection)root.openConnection();
+ connection.connect();
+
+ assertEquals(200, connection.getResponseCode());
+ }
 }

tests/src/test/java/ContainerTestBase.java

@@ -1,3 +1,4 @@
+import org.junit.After;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.slf4j.Logger;
@@ -11,23 +12,30 @@ public abstract class ContainerTestBase {
 
  private static GenericContainer _container;
 
- @BeforeClass
- public static void setUp() {
- String dockerImageTag = System.getProperty("image_tag", "homecentr/cadvisor");
+ protected void startContainer() {
+ startContainer("", "");
+ }
+
+ protected void startContainer(String uid, String gid) {
+ String dockerImageTag = System.getProperty("image_tag");
 
  logger.info("Tested Docker image tag: {}", dockerImageTag);
 
- _container = new GenericContainer<>(System.getProperty("image_tag", dockerImageTag))
+ _container = new GenericContainer<>(dockerImageTag)
+ .withEnv("PUID", uid)
+ .withEnv("PGID", gid)
  .waitingFor(Wait.forHealthcheck());
 
  _container.start();
  _container.followOutput(new Slf4jLogConsumer(logger));
  }
 
- @AfterClass
- public static void cleanUp() {
- _container.stop();
- _container.close();
+ @After
+ public void cleanUp() {
+ if(_container != null) {
+ _container.stop();
+ _container.close();
+ }
  }
 
  protected GenericContainer getContainer() {