Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 10 additions & 0 deletions e2e/framework/workspace.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,16 @@ func SetupDockerWorkspace(testdataPath, initialDir string) (string, *Framework,
return tempDir, f, nil
}

// CopyTestdata copies testdataPath to a temp dir, changes into it, and registers
// cleanup that removes the temp dir and changes back to initialDir.
func CopyTestdata(testdataPath, initialDir string) string {
tempDir, err := CopyToTempDir(testdataPath)
ExpectNoErrorWithOffset(1, err)
ginkgo.DeferCleanup(CleanupTempDir, initialDir, tempDir)

return tempDir
}

// SetupDockerWorkspaceAndUp is SetupDockerWorkspace followed by devsy up.
func SetupDockerWorkspaceAndUp(
ctx context.Context,
Expand Down
55 changes: 19 additions & 36 deletions e2e/tests/build/build.go
Original file line number Diff line number Diff line change
Expand Up @@ -73,12 +73,10 @@ var _ = ginkgo.Describe("devsy build test suite", ginkgo.Label("build"), ginkgo.
ginkgo.SpecTimeout(framework.TimeoutShort()),
func(ctx context.Context) {
f := framework.NewDefaultFramework(initialDir + "/bin")
tempDir, err := framework.CopyToTempDir("tests/build/testdata/docker")
framework.ExpectNoError(err)
ginkgo.DeferCleanup(framework.CleanupTempDir, initialDir, tempDir)
tempDir := framework.CopyTestdata("tests/build/testdata/docker", initialDir)

_ = f.DevsyProviderDelete(ctx, "docker")
err = f.DevsyProviderAdd(ctx, "docker")
err := f.DevsyProviderAdd(ctx, "docker")
framework.ExpectNoError(err)
err = f.DevsyProviderUse(ctx, "docker")
framework.ExpectNoError(err)
Expand Down Expand Up @@ -147,12 +145,10 @@ var _ = ginkgo.Describe("devsy build test suite", ginkgo.Label("build"), ginkgo.
ginkgo.SpecTimeout(framework.TimeoutShort()),
func(ctx context.Context) {
f := framework.NewDefaultFramework(initialDir + "/bin")
tempDir, err := framework.CopyToTempDir("tests/build/testdata/docker")
framework.ExpectNoError(err)
ginkgo.DeferCleanup(framework.CleanupTempDir, initialDir, tempDir)
tempDir := framework.CopyTestdata("tests/build/testdata/docker", initialDir)

_ = f.DevsyProviderDelete(ctx, "docker")
err = f.DevsyProviderAdd(ctx, "docker")
err := f.DevsyProviderAdd(ctx, "docker")
framework.ExpectNoError(err)
err = f.DevsyProviderUse(ctx, "docker")
framework.ExpectNoError(err)
Expand Down Expand Up @@ -198,12 +194,10 @@ var _ = ginkgo.Describe("devsy build test suite", ginkgo.Label("build"), ginkgo.
ginkgo.SpecTimeout(framework.TimeoutShort()),
func(ctx context.Context) {
f := framework.NewDefaultFramework(initialDir + "/bin")
tempDir, err := framework.CopyToTempDir("tests/build/testdata/docker-compose")
framework.ExpectNoError(err)
ginkgo.DeferCleanup(framework.CleanupTempDir, initialDir, tempDir)
tempDir := framework.CopyTestdata("tests/build/testdata/docker-compose", initialDir)

_ = f.DevsyProviderDelete(ctx, "docker")
err = f.DevsyProviderAdd(ctx, "docker")
err := f.DevsyProviderAdd(ctx, "docker")
framework.ExpectNoError(err)
err = f.DevsyProviderUse(ctx, "docker")
framework.ExpectNoError(err)
Expand All @@ -226,14 +220,13 @@ var _ = ginkgo.Describe("devsy build test suite", ginkgo.Label("build"), ginkgo.
// This fixture uses a local no-op feature so it exercises feature
// installation without depending on distro package mirrors. Package
// upgrades are unrelated to the compose build-context behavior here.
tempDir, err := framework.CopyToTempDir(
tempDir := framework.CopyTestdata(
"tests/build/testdata/docker-compose-features-context",
initialDir,
)
framework.ExpectNoError(err)
ginkgo.DeferCleanup(framework.CleanupTempDir, initialDir, tempDir)

_ = f.DevsyProviderDelete(ctx, "docker")
err = f.DevsyProviderAdd(ctx, "docker")
err := f.DevsyProviderAdd(ctx, "docker")
framework.ExpectNoError(err)
err = f.DevsyProviderUse(ctx, "docker")
framework.ExpectNoError(err)
Expand All @@ -249,12 +242,10 @@ var _ = ginkgo.Describe("devsy build test suite", ginkgo.Label("build"), ginkgo.
ginkgo.SpecTimeout(framework.TimeoutShort()),
func(ctx context.Context) {
f := framework.NewDefaultFramework(initialDir + "/bin")
tempDir, err := framework.CopyToTempDir("tests/build/testdata/docker")
framework.ExpectNoError(err)
ginkgo.DeferCleanup(framework.CleanupTempDir, initialDir, tempDir)
tempDir := framework.CopyTestdata("tests/build/testdata/docker", initialDir)

_ = f.DevsyProviderDelete(ctx, "docker")
err = f.DevsyProviderAdd(ctx, "docker")
err := f.DevsyProviderAdd(ctx, "docker")
framework.ExpectNoError(err)
err = f.DevsyProviderUse(ctx, "docker")
framework.ExpectNoError(err)
Expand All @@ -275,12 +266,10 @@ var _ = ginkgo.Describe("devsy build test suite", ginkgo.Label("build"), ginkgo.
ginkgo.SpecTimeout(framework.TimeoutShort()),
func(ctx context.Context) {
f := framework.NewDefaultFramework(initialDir + "/bin")
tempDir, err := framework.CopyToTempDir("tests/build/testdata/docker")
framework.ExpectNoError(err)
ginkgo.DeferCleanup(framework.CleanupTempDir, initialDir, tempDir)
tempDir := framework.CopyTestdata("tests/build/testdata/docker", initialDir)

_ = f.DevsyProviderDelete(ctx, "docker")
err = f.DevsyProviderAdd(ctx, "docker")
err := f.DevsyProviderAdd(ctx, "docker")
framework.ExpectNoError(err)
err = f.DevsyProviderUse(ctx, "docker")
framework.ExpectNoError(err)
Expand Down Expand Up @@ -336,12 +325,10 @@ var _ = ginkgo.Describe("devsy build test suite", ginkgo.Label("build"), ginkgo.
}

f := framework.NewDefaultFramework(initialDir + "/bin")
tempDir, err := framework.CopyToTempDir("tests/build/testdata/kubernetes")
framework.ExpectNoError(err)
ginkgo.DeferCleanup(framework.CleanupTempDir, initialDir, tempDir)
tempDir := framework.CopyTestdata("tests/build/testdata/kubernetes", initialDir)

_ = f.DevsyProviderDelete(ctx, "kubernetes")
err = f.DevsyProviderAdd(ctx, "kubernetes")
err := f.DevsyProviderAdd(ctx, "kubernetes")
framework.ExpectNoError(err)
err = f.DevsyProviderUse(
ctx,
Expand Down Expand Up @@ -396,12 +383,10 @@ var _ = ginkgo.Describe("devsy build test suite", ginkgo.Label("build"), ginkgo.
}

f := framework.NewDefaultFramework(initialDir + "/bin")
tempDir, err := framework.CopyToTempDir("tests/build/testdata/kubernetes")
framework.ExpectNoError(err)
ginkgo.DeferCleanup(framework.CleanupTempDir, initialDir, tempDir)
tempDir := framework.CopyTestdata("tests/build/testdata/kubernetes", initialDir)

_ = f.DevsyProviderDelete(ctx, "kubernetes")
err = f.DevsyProviderAdd(ctx, "kubernetes")
err := f.DevsyProviderAdd(ctx, "kubernetes")
framework.ExpectNoError(err)
err = f.DevsyProviderUse(ctx, "kubernetes", "-o", "KUBERNETES_NAMESPACE=devsy")
framework.ExpectNoError(err)
Expand Down Expand Up @@ -441,12 +426,10 @@ func validateKubernetesDeploymentWithoutDocker(
}

f := framework.NewDefaultFramework(initialDir + "/bin")
tempDir, err := framework.CopyToTempDir("tests/build/testdata/kubernetes")
framework.ExpectNoError(err)
ginkgo.DeferCleanup(framework.CleanupTempDir, initialDir, tempDir)
tempDir := framework.CopyTestdata("tests/build/testdata/kubernetes", initialDir)

_ = f.DevsyProviderDelete(ctx, "kubernetes")
err = f.DevsyProviderAdd(ctx, "kubernetes")
err := f.DevsyProviderAdd(ctx, "kubernetes")
framework.ExpectNoError(err)
err = f.DevsyProviderUse(
ctx,
Expand Down
53 changes: 22 additions & 31 deletions e2e/tests/provider/provider.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,15 +28,14 @@ var _ = ginkgo.Describe(
ginkgo.It("should add simple provider and delete it",
ginkgo.SpecTimeout(framework.TimeoutShort()),
func(ctx context.Context) {
tempDir, err := framework.CopyToTempDir(
tempDir := framework.CopyTestdata(
"tests/provider/testdata/simple-k8s-provider",
initialDir,
)
framework.ExpectNoError(err)
ginkgo.DeferCleanup(framework.CleanupTempDir, initialDir, tempDir)

f := framework.NewDefaultFramework(initialDir + "/bin")

err = f.DevsyProviderDelete(ctx, "provider1", "--ignore-not-found")
err := f.DevsyProviderDelete(ctx, "provider1", "--ignore-not-found")
framework.ExpectNoError(err)

err = f.DevsyProviderAdd(ctx, tempDir+"/provider1.yaml")
Expand All @@ -57,15 +56,14 @@ var _ = ginkgo.Describe(
ginkgo.It("should add simple provider and update it",
ginkgo.SpecTimeout(framework.TimeoutShort()),
func(ctx context.Context) {
tempDir, err := framework.CopyToTempDir(
tempDir := framework.CopyTestdata(
"tests/provider/testdata/simple-k8s-provider",
initialDir,
)
framework.ExpectNoError(err)
ginkgo.DeferCleanup(framework.CleanupTempDir, initialDir, tempDir)

f := framework.NewDefaultFramework(initialDir + "/bin")

err = f.DevsyProviderDelete(ctx, "provider2", "--ignore-not-found")
err := f.DevsyProviderDelete(ctx, "provider2", "--ignore-not-found")
framework.ExpectNoError(err)

err = f.DevsyProviderAdd(ctx, tempDir+"/provider2.yaml")
Expand Down Expand Up @@ -114,15 +112,14 @@ var _ = ginkgo.Describe(
ginkgo.It("should list all providers",
ginkgo.SpecTimeout(framework.TimeoutShort()),
func(ctx context.Context) {
tempDir, err := framework.CopyToTempDir(
tempDir := framework.CopyTestdata(
"tests/provider/testdata/simple-k8s-provider",
initialDir,
)
framework.ExpectNoError(err)
ginkgo.DeferCleanup(framework.CleanupTempDir, initialDir, tempDir)

f := framework.NewDefaultFramework(initialDir + "/bin")

err = f.DevsyProviderDelete(ctx, "provider1", "--ignore-not-found")
err := f.DevsyProviderDelete(ctx, "provider1", "--ignore-not-found")
framework.ExpectNoError(err)

err = f.DevsyProviderAdd(ctx, tempDir+"/provider1.yaml")
Expand All @@ -147,15 +144,14 @@ var _ = ginkgo.Describe(
ginkgo.It("should parse options",
ginkgo.SpecTimeout(framework.TimeoutShort()),
func(ctx context.Context) {
tempDir, err := framework.CopyToTempDir(
tempDir := framework.CopyTestdata(
"tests/provider/testdata/simple-k8s-provider",
initialDir,
)
framework.ExpectNoError(err)
ginkgo.DeferCleanup(framework.CleanupTempDir, initialDir, tempDir)

f := framework.NewDefaultFramework(initialDir + "/bin")

err = f.DevsyProviderDelete(ctx, "provider3", "--ignore-not-found")
err := f.DevsyProviderDelete(ctx, "provider3", "--ignore-not-found")
framework.ExpectNoError(err)

podManifest := `
Expand Down Expand Up @@ -191,19 +187,18 @@ spec:
ginkgo.It("should rename a provider to a new, valid name",
ginkgo.SpecTimeout(framework.TimeoutShort()),
func(ctx context.Context) {
tempDir, err := framework.CopyToTempDir(
tempDir := framework.CopyTestdata(
"tests/provider/testdata/simple-k8s-provider",
initialDir,
)
framework.ExpectNoError(err)
ginkgo.DeferCleanup(framework.CleanupTempDir, initialDir, tempDir)

f := framework.NewDefaultFramework(initialDir + "/bin")

providerName := "provider-rename1"
renamedProviderName := "provider-renamed"

// Ensure that provider is deleted.
err = f.DevsyProviderDelete(ctx, providerName, "--ignore-not-found")
err := f.DevsyProviderDelete(ctx, providerName, "--ignore-not-found")
framework.ExpectNoError(err)
err = f.DevsyProviderDelete(ctx, renamedProviderName, "--ignore-not-found")
framework.ExpectNoError(err)
Expand Down Expand Up @@ -232,18 +227,17 @@ spec:
"should fail to rename a provider to a name that already exists",
ginkgo.SpecTimeout(framework.TimeoutShort()),
func(ctx context.Context) {
tempDir, err := framework.CopyToTempDir(
tempDir := framework.CopyTestdata(
"tests/provider/testdata/simple-k8s-provider",
initialDir,
)
framework.ExpectNoError(err)
ginkgo.DeferCleanup(framework.CleanupTempDir, initialDir, tempDir)

f := framework.NewDefaultFramework(initialDir + "/bin")

providerToRename := "provider-to-rename2"
existingProvider := "existing-provider2"

err = f.DevsyProviderDelete(ctx, providerToRename, "--ignore-not-found")
err := f.DevsyProviderDelete(ctx, providerToRename, "--ignore-not-found")
framework.ExpectNoError(err)
err = f.DevsyProviderDelete(ctx, existingProvider, "--ignore-not-found")
framework.ExpectNoError(err)
Expand Down Expand Up @@ -323,9 +317,7 @@ spec:
err = f.DevsyProviderDelete(ctx, renamedProviderName, "--ignore-not-found")
framework.ExpectNoError(err)

tempDir, err := framework.CopyToTempDir("tests/up/testdata/no-devcontainer")
framework.ExpectNoError(err)
ginkgo.DeferCleanup(framework.CleanupTempDir, initialDir, tempDir)
tempDir := framework.CopyTestdata("tests/up/testdata/no-devcontainer", initialDir)

err = f.DevsyProviderAddDocker(ctx, providerName)
framework.ExpectNoError(err)
Expand Down Expand Up @@ -380,17 +372,16 @@ spec:
ginkgo.It("should fail to rename a provider to an invalid name",
ginkgo.SpecTimeout(framework.TimeoutShort()),
func(ctx context.Context) {
tempDir, err := framework.CopyToTempDir(
tempDir := framework.CopyTestdata(
"tests/provider/testdata/simple-k8s-provider",
initialDir,
)
framework.ExpectNoError(err)
ginkgo.DeferCleanup(framework.CleanupTempDir, initialDir, tempDir)

f := framework.NewDefaultFramework(initialDir + "/bin")

providerName := "provider-to-rename-invalid6"

err = f.DevsyProviderDelete(ctx, providerName, "--ignore-not-found")
err := f.DevsyProviderDelete(ctx, providerName, "--ignore-not-found")
framework.ExpectNoError(err)

err = f.DevsyProviderAdd(ctx, tempDir+"/provider1.yaml", "--name", providerName)
Expand Down
20 changes: 5 additions & 15 deletions e2e/tests/rename/rename.go
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,7 @@ var _ = ginkgo.Describe(
err := f.DevsyProviderDelete(ctx, providerName, "--ignore-not-found")
framework.ExpectNoError(err)

tempDir, err := framework.CopyToTempDir("tests/up/testdata/no-devcontainer")
framework.ExpectNoError(err)
ginkgo.DeferCleanup(framework.CleanupTempDir, initialDir, tempDir)
tempDir := framework.CopyTestdata("tests/up/testdata/no-devcontainer", initialDir)

err = f.DevsyProviderAddDocker(ctx, providerName)
framework.ExpectNoError(err)
Expand Down Expand Up @@ -116,9 +114,7 @@ var _ = ginkgo.Describe(
err := f.DevsyProviderDelete(ctx, providerName, "--ignore-not-found")
framework.ExpectNoError(err)

tempDir, err := framework.CopyToTempDir("tests/up/testdata/no-devcontainer")
framework.ExpectNoError(err)
ginkgo.DeferCleanup(framework.CleanupTempDir, initialDir, tempDir)
tempDir := framework.CopyTestdata("tests/up/testdata/no-devcontainer", initialDir)

err = f.DevsyProviderAddDocker(ctx, providerName)
framework.ExpectNoError(err)
Expand Down Expand Up @@ -175,9 +171,7 @@ var _ = ginkgo.Describe(
err := f.DevsyProviderDelete(ctx, providerName, "--ignore-not-found")
framework.ExpectNoError(err)

tempDir, err := framework.CopyToTempDir("tests/up/testdata/no-devcontainer")
framework.ExpectNoError(err)
ginkgo.DeferCleanup(framework.CleanupTempDir, initialDir, tempDir)
tempDir := framework.CopyTestdata("tests/up/testdata/no-devcontainer", initialDir)

err = f.DevsyProviderAddDocker(ctx, providerName)
framework.ExpectNoError(err)
Expand Down Expand Up @@ -233,9 +227,7 @@ var _ = ginkgo.Describe(
err := f.DevsyProviderDelete(ctx, providerName, "--ignore-not-found")
framework.ExpectNoError(err)

tempDir, err := framework.CopyToTempDir("tests/up/testdata/no-devcontainer")
framework.ExpectNoError(err)
ginkgo.DeferCleanup(framework.CleanupTempDir, initialDir, tempDir)
tempDir := framework.CopyTestdata("tests/up/testdata/no-devcontainer", initialDir)

err = f.DevsyProviderAddDocker(ctx, providerName)
framework.ExpectNoError(err)
Expand Down Expand Up @@ -279,9 +271,7 @@ var _ = ginkgo.Describe(
err := f.DevsyProviderDelete(ctx, providerName, "--ignore-not-found")
framework.ExpectNoError(err)

tempDir, err := framework.CopyToTempDir("tests/up/testdata/no-devcontainer")
framework.ExpectNoError(err)
ginkgo.DeferCleanup(framework.CleanupTempDir, initialDir, tempDir)
tempDir := framework.CopyTestdata("tests/up/testdata/no-devcontainer", initialDir)

err = f.DevsyProviderAddDocker(ctx, providerName)
framework.ExpectNoError(err)
Expand Down
Loading
Loading