2 files changed, 54 insertions, 0 deletions
diff --git a/runsc/test/image/BUILD b/runsc/test/image/BUILD
index e3985ecc4..fda6f2d9c 100644
--- a/runsc/test/image/BUILD
+++ b/runsc/test/image/BUILD
@@ -8,6 +8,7 @@ go_test(
     srcs = [
         "image_test.go",
         "python_test.go",
+        "tomcat_test.go",
     ],
     data = [
         "latin10k.txt",
diff --git a/runsc/test/image/tomcat_test.go b/runsc/test/image/tomcat_test.go
new file mode 100644
index 000000000..578385ca7
--- /dev/null
+++ b/runsc/test/image/tomcat_test.go
@@ -0,0 +1,53 @@
+// Copyright 2018 Google Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package image
+
+import (
+	"fmt"
+	"net/http"
+	"testing"
+	"time"
+
+	"gvisor.googlesource.com/gvisor/runsc/test/testutil"
+)
+
+func TestTomcat(t *testing.T) {
+	d := testutil.MakeDocker("tomcat-test")
+	if out, err := d.Run("-p", "8080", "tomcat:8.0"); err != nil {
+		t.Fatalf("docker run failed: %v\nout: %s", err, out)
+	}
+	defer d.CleanUp()
+
+	// Find where port 8080 is mapped to.
+	port, err := d.FindPort(8080)
+	if err != nil {
+		t.Fatalf("docker.FindPort(8080) failed: %v", err)
+	}
+
+	// Wait until it's up and running.
+	if err := d.WaitForHTTP(port, 10*time.Second); err != nil {
+		t.Fatalf("docker.WaitForHTTP() timeout: %v", err)
+	}
+
+	// Ensure that content is being served.
+	url := fmt.Sprintf("http://localhost:%d", port)
+	resp, err := http.Get(url)
+	if err != nil {
+		t.Errorf("Error reaching http server: %v", err)
+	}
+	if want := http.StatusOK; resp.StatusCode != want {
+		t.Errorf("Wrong response code, got: %d, want: %d", resp.StatusCode, want)
+	}
+}