Isolation strings, should match user input

define/isolation.go

@@ -21,14 +21,12 @@ const (
 // String converts a Isolation into a string.
 func (i Isolation) String() string {
 	switch i {
-	case IsolationDefault:
-		return "IsolationDefault"
-	case IsolationOCI:
-		return "IsolationOCI"
+	case IsolationDefault, IsolationOCI:
+		return "oci"
 	case IsolationChroot:
-		return "IsolationChroot"
+		return "chroot"
 	case IsolationOCIRootless:
-		return "IsolationOCIRootless"
+		return "rootless"
 	}
 	return fmt.Sprintf("unrecognized isolation type %d", i)
 }

pkg/parse/parse.go

@@ -959,7 +959,7 @@ func defaultIsolation() (define.Isolation, error) {
 func IsolationOption(isolation string) (define.Isolation, error) {
 	if isolation != "" {
 		switch strings.ToLower(isolation) {
-		case "oci":
+		case "oci", "default":
 			return define.IsolationOCI, nil
 		case "rootless":
 			return define.IsolationOCIRootless, nil

pkg/parse/parse_test.go

@@ -1,6 +1,7 @@
 package parse
 
 import (
+	"fmt"
 	"runtime"
 	"testing"
 
@@ -93,3 +94,31 @@ func TestDeviceFromPath(t *testing.T) {
 	_, err = DeviceFromPath("/etc/passwd")
 	assert.Error(t, err)
 }
+
+func TestIsolation(t *testing.T) {
+	def, err := defaultIsolation()
+	if err != nil {
+		assert.Error(t, err)
+	}
+
+	isolations := []string{"", "default", "oci", "chroot", "rootless"}
+	for _, i := range isolations {
+		isolation, err := IsolationOption(i)
+		if err != nil {
+			assert.Error(t, fmt.Errorf("isolation %q not supported", i))
+		}
+		var expected string
+		switch i {
+		case "":
+			expected = def.String()
+		case "default":
+			expected = "oci"
+		default:
+			expected = i
+		}
+
+		if isolation.String() != expected {
+			assert.Error(t, fmt.Errorf("isolation %q not equal to user input %q", isolation.String(), expected))
+		}
+	}
+}