summaryrefslogtreecommitdiffhomepage
path: root/runsc/test/image
diff options
context:
space:
mode:
Diffstat (limited to 'runsc/test/image')
-rw-r--r--runsc/test/image/image_test.go40
-rw-r--r--runsc/test/image/python_test.go12
-rw-r--r--runsc/test/image/tomcat_test.go12
3 files changed, 32 insertions, 32 deletions
diff --git a/runsc/test/image/image_test.go b/runsc/test/image/image_test.go
index 248934484..962c31b24 100644
--- a/runsc/test/image/image_test.go
+++ b/runsc/test/image/image_test.go
@@ -39,8 +39,8 @@ import (
func TestHelloWorld(t *testing.T) {
d := testutil.MakeDocker("hello-test")
- if out, err := d.Run("hello-world"); err != nil {
- t.Fatalf("docker run failed: %v\nout: %s", err, out)
+ if _, err := d.Run("hello-world"); err != nil {
+ t.Fatalf("docker run failed: %v", err)
}
defer d.CleanUp()
@@ -82,8 +82,8 @@ func testHTTPServer(port int) error {
}
func TestHttpd(t *testing.T) {
- if out, err := testutil.Pull("httpd"); err != nil {
- t.Fatalf("docker pull failed: %v\nout: %s", err, out)
+ if err := testutil.Pull("httpd"); err != nil {
+ t.Fatalf("docker pull failed: %v", err)
}
d := testutil.MakeDocker("http-test")
@@ -93,8 +93,8 @@ func TestHttpd(t *testing.T) {
}
// Start the container.
- if out, err := d.Run("-p", "80", "-v", testutil.MountArg(dir, "/usr/local/apache2/htdocs:ro"), "httpd"); err != nil {
- t.Fatalf("docker run failed: %v\nout: %s", err, out)
+ if _, err := d.Run("-p", "80", "-v", testutil.MountArg(dir, "/usr/local/apache2/htdocs:ro"), "httpd"); err != nil {
+ t.Fatalf("docker run failed: %v", err)
}
defer d.CleanUp()
@@ -105,8 +105,8 @@ func TestHttpd(t *testing.T) {
}
// Wait until it's up and running.
- if err := d.WaitForHTTP(port, 5*time.Second); err != nil {
- t.Fatalf("docker.WaitForHTTP() timeout: %v", err)
+ if err := testutil.WaitForHTTP(port, 5*time.Second); err != nil {
+ t.Fatalf("WaitForHTTP() timeout: %v", err)
}
if err := testHTTPServer(port); err != nil {
@@ -115,8 +115,8 @@ func TestHttpd(t *testing.T) {
}
func TestNginx(t *testing.T) {
- if out, err := testutil.Pull("nginx"); err != nil {
- t.Fatalf("docker pull failed: %v\nout: %s", err, out)
+ if err := testutil.Pull("nginx"); err != nil {
+ t.Fatalf("docker pull failed: %v", err)
}
d := testutil.MakeDocker("net-test")
@@ -126,8 +126,8 @@ func TestNginx(t *testing.T) {
}
// Start the container.
- if out, err := d.Run("-p", "80", "-v", testutil.MountArg(dir, "/usr/share/nginx/html:ro"), "nginx"); err != nil {
- t.Fatalf("docker run failed: %v\nout: %s", err, out)
+ if _, err := d.Run("-p", "80", "-v", testutil.MountArg(dir, "/usr/share/nginx/html:ro"), "nginx"); err != nil {
+ t.Fatalf("docker run failed: %v", err)
}
defer d.CleanUp()
@@ -138,8 +138,8 @@ func TestNginx(t *testing.T) {
}
// Wait until it's up and running.
- if err := d.WaitForHTTP(port, 5*time.Second); err != nil {
- t.Fatalf("docker.WaitForHTTP() timeout: %v", err)
+ if err := testutil.WaitForHTTP(port, 5*time.Second); err != nil {
+ t.Fatalf("WaitForHTTP() timeout: %v", err)
}
if err := testHTTPServer(port); err != nil {
@@ -148,14 +148,14 @@ func TestNginx(t *testing.T) {
}
func TestMysql(t *testing.T) {
- if out, err := testutil.Pull("mysql"); err != nil {
- t.Fatalf("docker pull failed: %v\nout: %s", err, out)
+ if err := testutil.Pull("mysql"); err != nil {
+ t.Fatalf("docker pull failed: %v", err)
}
d := testutil.MakeDocker("mysql-test")
// Start the container.
- if out, err := d.Run("-e", "MYSQL_ROOT_PASSWORD=foobar123", "mysql"); err != nil {
- t.Fatalf("docker run failed: %v\nout: %s", err, out)
+ if _, err := d.Run("-e", "MYSQL_ROOT_PASSWORD=foobar123", "mysql"); err != nil {
+ t.Fatalf("docker run failed: %v", err)
}
defer d.CleanUp()
@@ -178,8 +178,8 @@ func TestMysql(t *testing.T) {
"mysql",
"mysql", "-hmysql", "-uroot", "-pfoobar123", "-v", "-e", "source /sql/mysql.sql",
}
- if out, err := client.Run(args...); err != nil {
- t.Fatalf("docker run failed: %v\nout: %s", err, out)
+ if _, err := client.Run(args...); err != nil {
+ t.Fatalf("docker run failed: %v", err)
}
defer client.CleanUp()
diff --git a/runsc/test/image/python_test.go b/runsc/test/image/python_test.go
index b77a6ec87..a8d28e080 100644
--- a/runsc/test/image/python_test.go
+++ b/runsc/test/image/python_test.go
@@ -24,12 +24,12 @@ import (
)
func TestPythonHello(t *testing.T) {
- if out, err := testutil.Pull("google/python-hello"); err != nil {
- t.Fatalf("docker pull failed: %v\nout: %s", err, out)
+ if err := testutil.Pull("google/python-hello"); err != nil {
+ t.Fatalf("docker pull failed: %v", err)
}
d := testutil.MakeDocker("python-hello-test")
- if out, err := d.Run("-p", "8080", "google/python-hello"); err != nil {
- t.Fatalf("docker run failed: %v\nout: %s", err, out)
+ if _, err := d.Run("-p", "8080", "google/python-hello"); err != nil {
+ t.Fatalf("docker run failed: %v", err)
}
defer d.CleanUp()
@@ -40,8 +40,8 @@ func TestPythonHello(t *testing.T) {
}
// Wait until it's up and running.
- if err := d.WaitForHTTP(port, 10*time.Second); err != nil {
- t.Fatalf("docker.WaitForHTTP() timeout: %v", err)
+ if err := testutil.WaitForHTTP(port, 10*time.Second); err != nil {
+ t.Fatalf("WaitForHTTP() timeout: %v", err)
}
// Ensure that content is being served.
diff --git a/runsc/test/image/tomcat_test.go b/runsc/test/image/tomcat_test.go
index dd47ab6da..97cf95834 100644
--- a/runsc/test/image/tomcat_test.go
+++ b/runsc/test/image/tomcat_test.go
@@ -24,12 +24,12 @@ import (
)
func TestTomcat(t *testing.T) {
- if out, err := testutil.Pull("tomcat:8.0"); err != nil {
- t.Fatalf("docker pull failed: %v\nout: %s", err, out)
+ if err := testutil.Pull("tomcat:8.0"); err != nil {
+ t.Fatalf("docker pull failed: %v", err)
}
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)
+ if _, err := d.Run("-p", "8080", "tomcat:8.0"); err != nil {
+ t.Fatalf("docker run failed: %v", err)
}
defer d.CleanUp()
@@ -40,8 +40,8 @@ func TestTomcat(t *testing.T) {
}
// Wait until it's up and running.
- if err := d.WaitForHTTP(port, 10*time.Second); err != nil {
- t.Fatalf("docker.WaitForHTTP() timeout: %v", err)
+ if err := testutil.WaitForHTTP(port, 10*time.Second); err != nil {
+ t.Fatalf("WaitForHTTP() timeout: %v", err)
}
// Ensure that content is being served.
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-24 06:06:43 +0000