Merge pull request #75 from AkihiroSuda/dev-ci

add more tests

Author: AkihiroSuda

image_convert_test.go

@@ -0,0 +1,35 @@
+/*
+   Copyright (C) nerdctl authors.
+   Copyright (C) containerd authors.
+
+   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 main
+
+import (
+	"testing"
+
+	"github.com/AkihiroSuda/nerdctl/pkg/testutil"
+)
+
+func TestImageConvertEStargz(t *testing.T) {
+	testutil.DockerIncompatible(t)
+	base := testutil.NewBase(t)
+	convertedImage := "test-image-convert:esgz"
+	base.Cmd("rmi", convertedImage).Run()
+	defer base.Cmd("rmi", convertedImage).Run()
+	base.Cmd("pull", testutil.AlpineImage).AssertOK()
+	base.Cmd("image", "convert", "--estargz", "--oci",
+		testutil.AlpineImage, convertedImage).AssertOK()
+}

pkg/testutil/testutil.go

@@ -111,14 +111,10 @@ func (b *Base) EnsureDaemonActive() {
 type Cmd struct {
 	icmd.Cmd
 	*Base
-	DockerIncompatible bool
 }
 
 func (c *Cmd) Run() *icmd.Result {
 	c.Base.T.Helper()
-	if c.Base.Target == Docker && c.DockerIncompatible {
-		c.Base.T.Skip("test is incompatible with Docker")
-	}
 	return icmd.RunCmd(c.Cmd)
 }
 
@@ -180,6 +176,12 @@ func GetDaemonIsKillable() bool {
 	return flagTestKillDaemon
 }
 
+func DockerIncompatible(t testing.TB) {
+	if GetTarget() == Docker {
+		t.Skip("test is incompatible with Docker")
+	}
+}
+
 const Namespace = "nerdctl-test"
 
 func NewBase(t *testing.T) *Base {