diff --git a/test/components/component_delete_multiple_release_test.go b/test/components/component_delete_multiple_release_test.go index 153ec7db1..a8f9278cb 100644 --- a/test/components/component_delete_multiple_release_test.go +++ b/test/components/component_delete_multiple_release_test.go @@ -20,19 +20,13 @@ package components_test import ( "testing" - "github.com/kinvolk/lokomotive/pkg/components" "github.com/kinvolk/lokomotive/pkg/components/util" - _ "github.com/kinvolk/lokomotive/pkg/components/web-ui" + webui "github.com/kinvolk/lokomotive/pkg/components/web-ui" testutil "github.com/kinvolk/lokomotive/test/components/util" ) func TestDeleteNamespaceMultipleRelease(t *testing.T) { - n := "web-ui" - - c, err := components.Get(n) - if err != nil { - t.Fatalf("failed getting component: %v", err) - } + c := webui.NewConfig() k := testutil.Kubeconfig(t) diff --git a/test/components/install_test.go b/test/components/install_test.go index 50abb892b..d16abaf35 100644 --- a/test/components/install_test.go +++ b/test/components/install_test.go @@ -20,35 +20,13 @@ package components import ( "testing" - "github.com/hashicorp/hcl/v2" - - "github.com/kinvolk/lokomotive/pkg/components" - _ "github.com/kinvolk/lokomotive/pkg/components/flatcar-linux-update-operator" + fluo "github.com/kinvolk/lokomotive/pkg/components/flatcar-linux-update-operator" "github.com/kinvolk/lokomotive/pkg/components/util" testutil "github.com/kinvolk/lokomotive/test/components/util" ) func TestInstallIdempotent(t *testing.T) { - configHCL := ` -component "flatcar-linux-update-operator" {} - ` - - n := "flatcar-linux-update-operator" - - c, err := components.Get(n) - if err != nil { - t.Fatalf("failed getting component: %v", err) - } - - body, diagnostics := util.GetComponentBody(configHCL, n) - if diagnostics != nil { - t.Fatalf("Error getting component body: %v", diagnostics) - } - - diagnostics = c.LoadConfig(body, &hcl.EvalContext{}) - if diagnostics.HasErrors() { - t.Fatalf("Valid config should not return error, got: %s", diagnostics) - } + c := fluo.NewConfig() k := testutil.Kubeconfig(t)