Skip to content

test: Add getClient() #200

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

test: Add getClient() #200

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 25 additions & 20 deletions actionlint/main_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,27 +2,16 @@ package main_test

import (
"context"
"flag"
"os"
"testing"

"dagger.io/dagger"
"github.com/stretchr/testify/require"
)

var c *dagger.Client

func TestMain(m *testing.M) {
flag.Parse()

func getClient() (*dagger.Client, error) {
ctx := context.Background()

c, _ = dagger.Connect(ctx, dagger.WithLogOutput(os.Stderr))
defer c.Close()

code := m.Run()
defer c.Close()
os.Exit(code)
return dagger.Connect(ctx, dagger.WithLogOutput(os.Stderr))
}

func Test_Actionlint(t *testing.T) {
Expand All @@ -31,11 +20,16 @@ func Test_Actionlint(t *testing.T) {

t.Run("Test_actionlint_error", func(t *testing.T) {
t.Parallel()
container := base("")

client, err := getClient()
require.NoError(t, err)
t.Cleanup(func() { client.Close() })

container := base("", client)
require.NotNil(t, container)

_, err := container.
WithMountedDirectory("/tmp", c.Host().Directory("./test/testdata/")).
_, err = container.
WithMountedDirectory("/tmp", client.Host().Directory("./test/testdata/")).
WithWorkdir("/tmp").
WithExec([]string{"sh", "-c", "find . -type f -name '*.yml' -print0 | xargs -0 actionlint"}).
Stderr(ctx)
Expand All @@ -44,7 +38,12 @@ func Test_Actionlint(t *testing.T) {
})
t.Run("Test_actionlint_version", func(t *testing.T) {
t.Parallel()
container := base("")

client, err := getClient()
require.NoError(t, err)
t.Cleanup(func() { client.Close() })

container := base("", client)
require.NotNil(t, container)

out, err := container.
Expand All @@ -55,7 +54,12 @@ func Test_Actionlint(t *testing.T) {
})
t.Run("Test_shellcheck_version", func(t *testing.T) {
t.Parallel()
container := base("")

client, err := getClient()
require.NoError(t, err)
t.Cleanup(func() { client.Close() })

container := base("", client)
require.NotNil(t, container)

out, err := container.
Expand All @@ -68,15 +72,16 @@ func Test_Actionlint(t *testing.T) {

func base(
image string,
client *dagger.Client,
) *dagger.Container {

defaultImageRepository := "rhysd/actionlint"
var ctr *dagger.Container

if image != "" {
ctr = c.Container().From(image)
ctr = client.Container().From(image)
} else {
ctr = c.Container().From(defaultImageRepository)
ctr = client.Container().From(defaultImageRepository)
}

return ctr
Expand Down
45 changes: 25 additions & 20 deletions editorconfig/main_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ package main_test

import (
"context"
"flag"
"os"
"path/filepath"
"testing"
Expand All @@ -11,19 +10,9 @@ import (
"github.com/stretchr/testify/require"
)

var c *dagger.Client

func TestMain(m *testing.M) {
flag.Parse()

func getClient() (*dagger.Client, error) {
ctx := context.Background()

c, _ = dagger.Connect(ctx, dagger.WithLogOutput(os.Stderr))
defer c.Close()

code := m.Run()
defer c.Close()
os.Exit(code)
return dagger.Connect(ctx, dagger.WithLogOutput(os.Stderr))
}

func Test_Editorconfig(t *testing.T) {
Expand All @@ -32,15 +21,20 @@ func Test_Editorconfig(t *testing.T) {

t.Run("Test_mounted_host_directory_without_git_directory", func(t *testing.T) {
t.Parallel()
container := base("")

client, err := getClient()
require.NoError(t, err)
t.Cleanup(func() { client.Close() })

container := base("", client)
require.NotNil(t, container)

dir, err := os.Getwd()
require.NoError(t, err)
require.NotEmpty(t, dir)

out, err := container.
WithMountedDirectory("/tmp", c.Host().Directory(filepath.Join(dir, ".."), dagger.HostDirectoryOpts{
WithMountedDirectory("/tmp", client.Host().Directory(filepath.Join(dir, ".."), dagger.HostDirectoryOpts{
Exclude: []string{".git"},
})).
WithWorkdir("/tmp").
Expand All @@ -52,11 +46,16 @@ func Test_Editorconfig(t *testing.T) {
})
t.Run("Test_mounted_host_directory", func(t *testing.T) {
t.Parallel()
container := base("")

client, err := getClient()
require.NoError(t, err)
t.Cleanup(func() { client.Close() })

container := base("", client)
require.NotNil(t, container)

out, err := container.
WithMountedDirectory("/tmp", c.Host().Directory("./test/testdata/")).
WithMountedDirectory("/tmp", client.Host().Directory("./test/testdata/")).
WithWorkdir("/tmp").
WithExec([]string{"ec", "-dry-run"}).
Stdout(ctx)
Expand All @@ -65,10 +64,15 @@ func Test_Editorconfig(t *testing.T) {
})
t.Run("Test_editorconfig-checker_help", func(t *testing.T) {
t.Parallel()
container := base("")

client, err := getClient()
require.NoError(t, err)
t.Cleanup(func() { client.Close() })

container := base("", client)
require.NotNil(t, container)

_, err := container.
_, err = container.
WithExec([]string{"ec", "-help"}).
Stderr(ctx)
require.NoError(t, err)
Expand All @@ -77,6 +81,7 @@ func Test_Editorconfig(t *testing.T) {

func base(
image string,
client *dagger.Client,
) *dagger.Container {

defaultImageRepository := "mstruebing/editorconfig-checker"
Expand All @@ -86,7 +91,7 @@ func base(
image = defaultImageRepository
}

ctr = c.Container().From(image)
ctr = client.Container().From(image)

return ctr
}
58 changes: 34 additions & 24 deletions hadolint/main_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,27 +2,16 @@ package main_test

import (
"context"
"flag"
"os"
"testing"

"dagger.io/dagger"
"github.com/stretchr/testify/require"
)

var c *dagger.Client

func TestMain(m *testing.M) {
flag.Parse()

func getClient() (*dagger.Client, error) {
ctx := context.Background()

c, _ = dagger.Connect(ctx, dagger.WithLogOutput(os.Stderr))
defer c.Close()

code := m.Run()
defer c.Close()
os.Exit(code)
return dagger.Connect(ctx, dagger.WithLogOutput(os.Stderr))
}

func Test_Hadolint(t *testing.T) {
Expand All @@ -31,25 +20,35 @@ func Test_Hadolint(t *testing.T) {

t.Run("Test_hadolint_with_config", func(t *testing.T) {
t.Parallel()
container := base("hadolint/hadolint:latest-alpine")

client, err := getClient()
require.NoError(t, err)
t.Cleanup(func() { client.Close() })

container := base("hadolint/hadolint:latest-alpine", client)
require.NotNil(t, container)

_, err := container.
WithMountedDirectory("/tmp", c.Host().Directory("./test/testdata")).
_, err = container.
WithMountedDirectory("/tmp", client.Host().Directory("./test/testdata")).
WithWorkdir("/tmp").
WithMountedFile("/.config/.hadolint.yaml", c.Host().File("./test/testdata/.config/.hadolint.yaml")).
WithMountedFile("/.config/.hadolint.yaml", client.Host().File("./test/testdata/.config/.hadolint.yaml")).
WithExec([]string{"sh", "-c", "find . -type f \\( -name 'Dockerfile' -o -name 'Dockerfile.*' \\) -print0 | xargs -0 hadolint --config /.config/.hadolint.yaml"}).
Stdout(ctx)
require.Error(t, err)
require.Contains(t, err.Error(), "exit code: 123")
})
t.Run("Test_hadolint_dockerfile_error", func(t *testing.T) {
t.Parallel()
container := base("hadolint/hadolint:latest-alpine")

client, err := getClient()
require.NoError(t, err)
t.Cleanup(func() { client.Close() })

container := base("hadolint/hadolint:latest-alpine", client)
require.NotNil(t, container)

_, err := container.
WithMountedDirectory("/tmp", c.Host().Directory("./test/testdata")).
_, err = container.
WithMountedDirectory("/tmp", client.Host().Directory("./test/testdata")).
WithWorkdir("/tmp").
WithExec([]string{"sh", "-c", "find . -type f \\( -name 'Dockerfile' -o -name 'Dockerfile.*' \\) -print0 | xargs -0 hadolint"}).
Stdout(ctx)
Expand All @@ -58,10 +57,15 @@ func Test_Hadolint(t *testing.T) {
})
t.Run("Test_hadolint_error", func(t *testing.T) {
t.Parallel()
container := base("hadolint/hadolint:latest-alpine")

client, err := getClient()
require.NoError(t, err)
t.Cleanup(func() { client.Close() })

container := base("hadolint/hadolint:latest-alpine", client)
require.NotNil(t, container)

_, err := container.
_, err = container.
WithNewFile(
"Dockerfile",
"FROM docker.io/library/alpine:$VARIANT",
Expand All @@ -77,7 +81,12 @@ func Test_Hadolint(t *testing.T) {
})
t.Run("Test_hadolint_version", func(t *testing.T) {
t.Parallel()
container := base("")

client, err := getClient()
require.NoError(t, err)
t.Cleanup(func() { client.Close() })

container := base("", client)
require.NotNil(t, container)

out, err := container.
Expand All @@ -90,6 +99,7 @@ func Test_Hadolint(t *testing.T) {

func base(
image string,
client *dagger.Client,
) *dagger.Container {

defaultImageRepository := "hadolint/hadolint"
Expand All @@ -99,7 +109,7 @@ func base(
image = defaultImageRepository
}

ctr = c.Container().From(image)
ctr = client.Container().From(image)

return ctr
}
22 changes: 8 additions & 14 deletions hello/main_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,27 +2,16 @@ package main_test

import (
"context"
"flag"
"os"
"testing"

"dagger.io/dagger"
"github.com/stretchr/testify/require"
)

var c *dagger.Client

func TestMain(m *testing.M) {
flag.Parse()

func getClient() (*dagger.Client, error) {
ctx := context.Background()

c, _ = dagger.Connect(ctx, dagger.WithLogOutput(os.Stderr))
defer c.Close()

code := m.Run()
defer c.Close()
os.Exit(code)
return dagger.Connect(ctx, dagger.WithLogOutput(os.Stderr))
}

func Test_Hello(t *testing.T) {
Expand All @@ -31,8 +20,13 @@ func Test_Hello(t *testing.T) {

t.Run("Test_hello_container", func(t *testing.T) {
t.Parallel()

client, err := getClient()
require.NoError(t, err)
t.Cleanup(func() { client.Close() })

stringArg := "Hello, Daggerverse!"
out, err := c.Container().
out, err := client.Container().
From("busybox:uclibc").
WithExec([]string{"echo", stringArg}).
Stdout(ctx)
Expand Down
Loading
Loading