Consolidate image tests into a single file

This is to keep it consistent with other test, and
it's easier to maintain them in single file.
Also increase python test timeout to deflake it.

PiperOrigin-RevId: 210575042
Change-Id: I2ef5bcd5d97c08549f0c5f645c4b694253ef0b4d
This commit is contained in:
Fabricio Voznika
2018-08-28 11:31:04 -07:00
committed by Shentubot
parent 25a8e13a78
commit f7366e4e64
4 changed files with 64 additions and 114 deletions
-2
View File
@@ -7,8 +7,6 @@ go_test(
size = "large",
srcs = [
"image_test.go",
"python_test.go",
"tomcat_test.go",
],
data = [
"latin10k.txt",
+64
View File
@@ -192,6 +192,70 @@ func TestMysql(t *testing.T) {
}
}
func TestPythonHello(t *testing.T) {
if err := testutil.Pull("google/python-hello"); err != nil {
t.Fatalf("docker pull failed: %v", err)
}
d := testutil.MakeDocker("python-hello-test")
if _, err := d.Run("-p", "8080", "google/python-hello"); err != nil {
t.Fatalf("docker run failed: %v", err)
}
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 := testutil.WaitForHTTP(port, 20*time.Second); err != nil {
t.Fatalf("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)
}
}
func TestTomcat(t *testing.T) {
if err := testutil.Pull("tomcat:8.0"); err != nil {
t.Fatalf("docker pull failed: %v", err)
}
d := testutil.MakeDocker("tomcat-test")
if _, err := d.Run("-p", "8080", "tomcat:8.0"); err != nil {
t.Fatalf("docker run failed: %v", err)
}
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 := testutil.WaitForHTTP(port, 10*time.Second); err != nil {
t.Fatalf("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)
}
}
func MainTest(m *testing.M) {
testutil.EnsureSupportedDockerVersion()
os.Exit(m.Run())
-56
View File
@@ -1,56 +0,0 @@
// 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 TestPythonHello(t *testing.T) {
if err := testutil.Pull("google/python-hello"); err != nil {
t.Fatalf("docker pull failed: %v", err)
}
d := testutil.MakeDocker("python-hello-test")
if _, err := d.Run("-p", "8080", "google/python-hello"); err != nil {
t.Fatalf("docker run failed: %v", err)
}
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 := testutil.WaitForHTTP(port, 10*time.Second); err != nil {
t.Fatalf("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)
}
}
-56
View File
@@ -1,56 +0,0 @@
// 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) {
if err := testutil.Pull("tomcat:8.0"); err != nil {
t.Fatalf("docker pull failed: %v", err)
}
d := testutil.MakeDocker("tomcat-test")
if _, err := d.Run("-p", "8080", "tomcat:8.0"); err != nil {
t.Fatalf("docker run failed: %v", err)
}
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 := testutil.WaitForHTTP(port, 10*time.Second); err != nil {
t.Fatalf("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)
}
}