Merge pull request #2178 from crazy-max/0.12_backport_fix-builder-creation

tonistiigi · web-flow · commit 30feaa1a915b · 2024-01-05T12:47:15.000-08:00
[v0.12 backport] driver(container): fix conditional statement for error handling
diff --git a/driver/docker-container/factory.go b/driver/docker-container/factory.go
@@ -51,11 +51,11 @@ func (f *factory) New(ctx context.Context, cfg driver.InitConfig) (driver.Driver
 		case k == "image":
 			d.image = v
 		case k == "memory":
-			if err := d.memory.Set(v); err == nil {
+			if err := d.memory.Set(v); err != nil {
 				return nil, err
 			}
 		case k == "memory-swap":
-			if err := d.memorySwap.Set(v); err == nil {
+			if err := d.memorySwap.Set(v); err != nil {
 				return nil, err
 			}
 		case k == "cpu-period":
diff --git a/tests/create.go b/tests/create.go
@@ -0,0 +1,39 @@
+package tests
+
+import (
+	"strings"
+	"testing"
+
+	"github.com/moby/buildkit/util/testutil/integration"
+	"github.com/stretchr/testify/require"
+)
+
+func createCmd(sb integration.Sandbox, opts ...cmdOpt) (string, error) {
+	opts = append([]cmdOpt{withArgs("create")}, opts...)
+	cmd := buildxCmd(sb, opts...)
+	out, err := cmd.CombinedOutput()
+	return string(out), err
+}
+
+var createTests = []func(t *testing.T, sb integration.Sandbox){
+	testCreateMemoryLimit,
+}
+
+func testCreateMemoryLimit(t *testing.T, sb integration.Sandbox) {
+	if sb.Name() != "docker-container" {
+		t.Skip("only testing for docker-container driver")
+	}
+
+	var builderName string
+	t.Cleanup(func() {
+		if builderName == "" {
+			return
+		}
+		out, err := rmCmd(sb, withArgs(builderName))
+		require.NoError(t, err, out)
+	})
+
+	out, err := createCmd(sb, withArgs("--driver", "docker-container", "--driver-opt", "network=host", "--driver-opt", "memory=1g"))
+	require.NoError(t, err, out)
+	builderName = strings.TrimSpace(out)
+}
diff --git a/tests/integration_test.go b/tests/integration_test.go
@@ -27,6 +27,7 @@ func TestIntegration(t *testing.T) {
 	tests = append(tests, lsTests...)
 	tests = append(tests, imagetoolsTests...)
 	tests = append(tests, versionTests...)
+	tests = append(tests, createTests...)
 	testIntegration(t, tests...)
 }
 
diff --git a/tests/rm.go b/tests/rm.go
@@ -0,0 +1,12 @@
+package tests
+
+import (
+	"github.com/moby/buildkit/util/testutil/integration"
+)
+
+func rmCmd(sb integration.Sandbox, opts ...cmdOpt) (string, error) {
+	opts = append([]cmdOpt{withArgs("rm")}, opts...)
+	cmd := buildxCmd(sb, opts...)
+	out, err := cmd.CombinedOutput()
+	return string(out), err
+}

Original file line number	Diff line number	Diff line change
`@@ -51,11 +51,11 @@ func (f *factory) New(ctx context.Context, cfg driver.InitConfig) (driver.Driver`
`51`	`51`	`case k == "image":`
`52`	`52`	`d.image = v`
`53`	`53`	`case k == "memory":`
`54`		`- if err := d.memory.Set(v); err == nil {`
	`54`	`+ if err := d.memory.Set(v); err != nil {`
`55`	`55`	`return nil, err`
`56`	`56`	`}`
`57`	`57`	`case k == "memory-swap":`
`58`		`- if err := d.memorySwap.Set(v); err == nil {`
	`58`	`+ if err := d.memorySwap.Set(v); err != nil {`
`59`	`59`	`return nil, err`
`60`	`60`	`}`
`61`	`61`	`case k == "cpu-period":`
Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,7 @@ func TestIntegration(t *testing.T) {`
`27`	`27`	`tests = append(tests, lsTests...)`
`28`	`28`	`tests = append(tests, imagetoolsTests...)`
`29`	`29`	`tests = append(tests, versionTests...)`
	`30`	`+ tests = append(tests, createTests...)`
`30`	`31`	`testIntegration(t, tests...)`
`31`	`32`	`}`
`32`	`33`