docker/buildx
1
0
Fork 0
mirror of https://gitea.com/Lydanne/buildx.git synced 2025-05-29 17:05:46 +08:00
Code Issues Packages Projects Releases 1 Wiki Activity

tests: add unsupported features detection skeleton

Browse Source 
Signed-off-by: Justin Chadwell <me@jedevc.com>
This commit is contained in:
Justin Chadwell 2023-08-04 11:25:57 +01:00
parent 4e7709e54c
commit 5e46d8057d
5 changed files with 32 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/workers/backend.go
View File

@ -35,7 +35,7 @@ func (s *backend) Rootless() bool {
return false return false
} }
func (b backend) Supports(feature string) bool { func (s backend) Supports(feature string) bool {
if enabledFeatures := os.Getenv("BUILDKIT_TEST_ENABLE_FEATURES"); enabledFeatures != "" { if enabledFeatures := os.Getenv("BUILDKIT_TEST_ENABLE_FEATURES"); enabledFeatures != "" {
for _, enabledFeature := range strings.Split(enabledFeatures, ",") { for _, enabledFeature := range strings.Split(enabledFeatures, ",") {
if feature == enabledFeature { if feature == enabledFeature {
@ -50,7 +50,7 @@ func (b backend) Supports(feature string) bool {
} }
} }
} }
for _, unsupportedFeature := range b.unsupportedFeatures { for _, unsupportedFeature := range s.unsupportedFeatures {
if feature == unsupportedFeature { if feature == unsupportedFeature {
return false return false
} }

7
tests/workers/docker-container.go
View File

@ -20,6 +20,8 @@ func InitDockerContainerWorker() {
type containerWorker struct { type containerWorker struct {
id string id string
unsupported []string
docker integration.Backend docker integration.Backend
dockerClose func() error dockerClose func() error
dockerErr error dockerErr error
@ -65,8 +67,9 @@ func (w *containerWorker) New(ctx context.Context, cfg *integration.BackendConfi
} }
return &backend{ return &backend{
context: w.docker.DockerAddress(), context: w.docker.DockerAddress(),
builder: name, builder: name,
unsupportedFeatures: w.unsupported,
}, cl, nil }, cl, nil
} }

9
tests/workers/docker.go
View File

@ -7,6 +7,7 @@ import (
"github.com/moby/buildkit/identity" "github.com/moby/buildkit/identity"
"github.com/moby/buildkit/util/testutil/integration" "github.com/moby/buildkit/util/testutil/integration"
bkworkers "github.com/moby/buildkit/util/testutil/workers"
"github.com/pkg/errors" "github.com/pkg/errors"
) )
@ -23,6 +24,7 @@ func InitDockerWorker() {
type dockerWorker struct { type dockerWorker struct {
id string id string
containerdSnapshotter bool containerdSnapshotter bool
unsupported []string
} }
func (c dockerWorker) Name() string { func (c dockerWorker) Name() string {
@ -34,7 +36,7 @@ func (c dockerWorker) Rootless() bool {
} }
func (c dockerWorker) New(ctx context.Context, cfg *integration.BackendConfig) (b integration.Backend, cl func() error, err error) { func (c dockerWorker) New(ctx context.Context, cfg *integration.BackendConfig) (b integration.Backend, cl func() error, err error) {
moby := integration.Moby{ moby := bkworkers.Moby{
ID: c.id, ID: c.id,
ContainerdSnapshotter: c.containerdSnapshotter, ContainerdSnapshotter: c.containerdSnapshotter,
} }
@ -66,8 +68,9 @@ func (c dockerWorker) New(ctx context.Context, cfg *integration.BackendConfig) (
} }
return &backend{ return &backend{
builder: name, builder: name,
context: name, context: name,
unsupportedFeatures: c.unsupported,
}, cl, nil }, cl, nil
} }

13
tests/workers/features.go Normal file
View File

@ -0,0 +1,13 @@
package workers
import (
"testing"
"github.com/moby/buildkit/util/testutil/integration"
)
var features = map[string]struct{}{}
func CheckFeatureCompat(t *testing.T, sb integration.Sandbox, reason ...string) {
integration.CheckFeatureCompat(t, sb, features, reason...)
}

9
tests/workers/remote.go
View File

@ -7,6 +7,7 @@ import (
"github.com/moby/buildkit/identity" "github.com/moby/buildkit/identity"
"github.com/moby/buildkit/util/testutil/integration" "github.com/moby/buildkit/util/testutil/integration"
bkworkers "github.com/moby/buildkit/util/testutil/workers"
"github.com/pkg/errors" "github.com/pkg/errors"
) )
@ -17,7 +18,8 @@ func InitRemoteWorker() {
} }
type remoteWorker struct { type remoteWorker struct {
id string id string
unsupported []string
} }
func (w remoteWorker) Name() string { func (w remoteWorker) Name() string {
@ -29,7 +31,7 @@ func (w remoteWorker) Rootless() bool {
} }
func (w remoteWorker) New(ctx context.Context, cfg *integration.BackendConfig) (b integration.Backend, cl func() error, err error) { func (w remoteWorker) New(ctx context.Context, cfg *integration.BackendConfig) (b integration.Backend, cl func() error, err error) {
oci := integration.OCI{ID: w.id} oci := bkworkers.OCI{ID: w.id}
bk, bkclose, err := oci.New(ctx, cfg) bk, bkclose, err := oci.New(ctx, cfg)
if err != nil { if err != nil {
return bk, cl, err return bk, cl, err
@ -60,7 +62,8 @@ func (w remoteWorker) New(ctx context.Context, cfg *integration.BackendConfig) (
} }
return &backend{ return &backend{
builder: name, builder: name,
unsupportedFeatures: w.unsupported,
}, cl, nil }, cl, nil
} }